From 6863f79118d3cb331fd4e726cdb2384bbd8bf8f2 Mon Sep 17 00:00:00 2001 From: Steven Sojka Date: Tue, 30 Mar 2021 08:18:24 -0500 Subject: refactor(all): language tree adaption (#1105) --- lua/nvim-treesitter/locals.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lua/nvim-treesitter/locals.lua') diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua index 01cacc6e..17982340 100644 --- a/lua/nvim-treesitter/locals.lua +++ b/lua/nvim-treesitter/locals.lua @@ -3,7 +3,6 @@ -- its the way nvim-treesitter uses to "understand" the code local queries = require'nvim-treesitter.query' -local parsers = require'nvim-treesitter.parsers' local ts_utils = require'nvim-treesitter.ts_utils' local api = vim.api @@ -91,13 +90,12 @@ end --- Iterates over a nodes scopes moving from the bottom up function M.iter_scope_tree(node, bufnr) local last_node = node - return function() if not last_node then return end - local scope = M.containing_scope(last_node, bufnr, false) or parsers.get_tree_root(bufnr) + local scope = M.containing_scope(last_node, bufnr, false) or ts_utils.get_root_for_node(node) last_node = scope:parent() @@ -222,7 +220,7 @@ function M.find_definition(node, bufnr) end end - return node, parsers.get_tree_root(bufnr), nil + return node, ts_utils.get_root_for_node(node), nil end -- Finds usages of a node in a given scope. @@ -235,7 +233,7 @@ function M.find_usages(node, scope_node, bufnr) if not node_text or #node_text < 1 then return {} end - local scope_node = scope_node or parsers.get_parser(bufnr):parse()[1]:root() + local scope_node = scope_node or ts_utils.get_root_for_node(node) local usages = {} for match in M.iter_locals(bufnr, scope_node) do -- cgit v1.2.3