Refactor locals.lua:

- shared query group stuff -> query.lua
- local-specific stuff from ts_utils -> locals.lua

4 files changed, 9 insertions, 7 deletions

diff --git a/lua/nvim-treesitter/refactor/highlight_current_scope.lua b/lua/nvim-treesitter/refactor/highlight_current_scope.lua
index b32ccaf3..8b785ef8 100644
--- a/lua/nvim-treesitter/refactor/highlight_current_scope.lua
+++ b/lua/nvim-treesitter/refactor/highlight_current_scope.lua
@@ -1,6 +1,7 @@
 -- This module highlights the current scope of at the cursor position
 
 local ts_utils = require'nvim-treesitter.ts_utils'
+local locals = require'nvim-treesitter.locals'
 local api = vim.api
 local cmd = api.nvim_command
 
@@ -12,7 +13,7 @@ function M.highlight_current_scope(bufnr)
   M.clear_highlights(bufnr)
 
   local node_at_point = ts_utils.get_node_at_cursor()
-  local current_scope = ts_utils.containing_scope(node_at_point, bufnr)
+  local current_scope = locals.containing_scope(node_at_point, bufnr)
 
   local start_line = current_scope:start()
 
diff --git a/lua/nvim-treesitter/refactor/highlight_definitions.lua b/lua/nvim-treesitter/refactor/highlight_definitions.lua
index d1eb4712..71081442 100644
--- a/lua/nvim-treesitter/refactor/highlight_definitions.lua
+++ b/lua/nvim-treesitter/refactor/highlight_definitions.lua
@@ -20,8 +20,8 @@ function M.highlight_usages(bufnr)
     return
   end
 
-  local def_node, scope = ts_utils.find_definition(node_at_point, bufnr)
-  local usages = ts_utils.find_usages(node_at_point, scope)
+  local def_node, scope = locals.find_definition(node_at_point, bufnr)
+  local usages = locals.find_usages(node_at_point, scope)
 
   for _, usage_node in ipairs(usages) do
     if usage_node ~= node_at_point then
diff --git a/lua/nvim-treesitter/refactor/navigation.lua b/lua/nvim-treesitter/refactor/navigation.lua
index ce653d6a..160fbd2e 100644
--- a/lua/nvim-treesitter/refactor/navigation.lua
+++ b/lua/nvim-treesitter/refactor/navigation.lua
@@ -16,7 +16,7 @@ function M.goto_definition(bufnr)
 
   if not node_at_point then return end
 
-  local definition, _ = ts_utils.find_definition(node_at_point, bufnr)
+  local definition, _ = locals.find_definition(node_at_point, bufnr)
   local start_row, start_col, _ = definition:start()
 
   api.nvim_win_set_cursor(0, { start_row + 1, start_col })
@@ -31,7 +31,7 @@ function M.list_definitions(bufnr)
   local qf_list = {}
 
   for _, def in ipairs(definitions) do
-    ts_utils.recurse_local_nodes(def, function(_, node, _, match)
+    locals.recurse_local_nodes(def, function(_, node, _, match)
       local lnum, col, _ = node:start()
 
       table.insert(qf_list, {
diff --git a/lua/nvim-treesitter/refactor/smart_rename.lua b/lua/nvim-treesitter/refactor/smart_rename.lua
index e5ee37ac..ad26085c 100644
--- a/lua/nvim-treesitter/refactor/smart_rename.lua
+++ b/lua/nvim-treesitter/refactor/smart_rename.lua
@@ -2,6 +2,7 @@
 -- Can be used directly using the `smart_rename` function.
 
 local ts_utils = require'nvim-treesitter.ts_utils'
+local locals = require'nvim-treesitter.locals'
 local configs = require'nvim-treesitter.configs'
 local utils = require'nvim-treesitter.utils'
 local api = vim.api
@@ -23,8 +24,8 @@ function M.smart_rename(bufnr)
   -- Empty name cancels the interaction or ESC
   if not new_name or #new_name < 1 then return end
 
-  local definition, scope = ts_utils.find_definition(node_at_point, bufnr)
-  local nodes_to_rename = ts_utils.find_usages(node_at_point, scope)
+  local definition, scope = locals.find_definition(node_at_point, bufnr)
+  local nodes_to_rename = locals.find_usages(node_at_point, scope)
 
   if not vim.tbl_contains(nodes_to_rename, node_at_point) then
     table.insert(nodes_to_rename, node_at_point)