benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-13 08:50:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: get_range shim for playground

Browse source
This commit is contained in:
Tom van Dijk 2023-03-24 22:44:28 +01:00 • committed by Lewis Russell
parent cb568af539
commit 5c3e8dee64
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lua/nvim-treesitter/compat.lua
View file

@ -1,5 +1,6 @@
-- Shim module to address deprecations across nvim versions -- Shim module to address deprecations across nvim versions
local tsq = vim.treesitter.query local ts = vim.treesitter
local tsq = ts.query
local M = {} local M = {}
@ -15,4 +16,8 @@ function M.parse_query(lang, query)
return (tsq.parse or tsq.parse_query)(lang, query) return (tsq.parse or tsq.parse_query)(lang, query)
end end
function M.get_range(node, source, metadata)
return (ts.get_range or tsq.get_range)(node, source, metadata)
end
return M return M

14
lua/nvim-treesitter/locals.lua
View file

@ -4,7 +4,7 @@
local queries = require "nvim-treesitter.query" local queries = require "nvim-treesitter.query"
local ts_utils = require "nvim-treesitter.ts_utils" local ts_utils = require "nvim-treesitter.ts_utils"
local ts_query = vim.treesitter.query local ts = vim.treesitter
local api = vim.api local api = vim.api
local M = {} local M = {}
@ -170,7 +170,7 @@ M.get_definitions_lookup_table = ts_utils.memoize_by_buf_tick(function(bufnr)
local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope) local scopes = M.get_definition_scopes(node_entry.node, bufnr, node_entry.scope)
-- Always use the highest valid scope -- Always use the highest valid scope
local scope = scopes[#scopes] local scope = scopes[#scopes]
local node_text = ts_query.get_node_text(node_entry.node, bufnr) local node_text = ts.get_node_text(node_entry.node, bufnr)
local id = M.get_definition_id(scope, node_text) local id = M.get_definition_id(scope, node_text)
result[id] = node_entry result[id] = node_entry
@ -223,7 +223,7 @@ end
---@return string|nil kind ---@return string|nil kind
function M.find_definition(node, bufnr) function M.find_definition(node, bufnr)
local def_lookup = M.get_definitions_lookup_table(bufnr) local def_lookup = M.get_definitions_lookup_table(bufnr)
local node_text = ts_query.get_node_text(node, bufnr) local node_text = ts.get_node_text(node, bufnr)
for scope in M.iter_scope_tree(node, bufnr) do for scope in M.iter_scope_tree(node, bufnr) do
local id = M.get_definition_id(scope, node_text) local id = M.get_definition_id(scope, node_text)
@ -244,7 +244,7 @@ end
---@return TSNode[]: a list of nodes ---@return TSNode[]: a list of nodes
function M.find_usages(node, scope_node, bufnr) function M.find_usages(node, scope_node, bufnr)
bufnr = bufnr or api.nvim_get_current_buf() bufnr = bufnr or api.nvim_get_current_buf()
local node_text = ts_query.get_node_text(node, bufnr) local node_text = ts.get_node_text(node, bufnr)
if not node_text or #node_text < 1 then if not node_text or #node_text < 1 then
return {} return {}
@ -254,11 +254,7 @@ function M.find_usages(node, scope_node, bufnr)
local usages = {} local usages = {}
for match in M.iter_locals(bufnr, scope_node) do for match in M.iter_locals(bufnr, scope_node) do
if if match.reference and match.reference.node and ts.get_node_text(match.reference.node, bufnr) == node_text then
match.reference
and match.reference.node
and ts_query.get_node_text(match.reference.node, bufnr) == node_text
then
local def_node, _, kind = M.find_definition(match.reference.node, bufnr) local def_node, _, kind = M.find_definition(match.reference.node, bufnr)
if kind == nil or def_node == node then if kind == nil or def_node == node then

2
queries/lua/injections.scm
View file

@ -14,7 +14,7 @@
((function_call ((function_call
name: (_) @_vimcmd_identifier name: (_) @_vimcmd_identifier
arguments: (arguments (string content: _ @query) .)) arguments: (arguments (string content: _ @query) .))
(#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query")) (#any-of? @_vimcmd_identifier "vim.treesitter.query.set" "vim.treesitter.query.parse_query" "vim.treesitter.query.parse"))
;; highlight string as query if starts with `;; query` ;; highlight string as query if starts with `;; query`
((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query")) ((string ("string_content") @query) (#lua-match? @query "^%s*;+%s?query"))