refactor(refactor): use higher local apis and some cleanup

3 files changed, 16 insertions, 29 deletions

diff --git a/lua/nvim-treesitter/refactor/highlight_definitions.lua b/lua/nvim-treesitter/refactor/highlight_definitions.lua
index 6279e470..bdbec158 100644
--- a/lua/nvim-treesitter/refactor/highlight_definitions.lua
+++ b/lua/nvim-treesitter/refactor/highlight_definitions.lua
@@ -15,8 +15,11 @@ function M.highlight_usages(bufnr)
   M.clear_usage_highlights(bufnr)
 
   local node_at_point = ts_utils.get_node_at_cursor()
+  local references = locals.get_references(bufnr)
 
-  if not node_at_point then return end
+  if not node_at_point or not vim.tbl_contains(references, node_at_point) then 
+    return
+  end
 
   local def_node, scope = ts_utils.find_definition(node_at_point, bufnr)
   local usages = ts_utils.find_usages(node_at_point, scope)
@@ -28,25 +31,23 @@ function M.highlight_usages(bufnr)
       api.nvim_buf_add_highlight(
         bufnr, 
         usage_namespace, 
-        'Visual', 
+        'TSDefinitionUsage', 
         start_row,
         start_col,
         end_col)
     end
   end
 
-  if def_node then
+  if def_node ~= node_at_point then
     local start_row, start_col, _, end_col = def_node:range()
 
-    if def_node ~= node_at_point then
-      api.nvim_buf_add_highlight(
-        bufnr, 
-        usage_namespace, 
-        'Search', 
-        start_row,
-        start_col,
-        end_col)
-    end
+    api.nvim_buf_add_highlight(
+      bufnr, 
+      usage_namespace, 
+      'TSDefinition', 
+      start_row,
+      start_col,
+      end_col)
   end
 end
 
diff --git a/lua/nvim-treesitter/refactor/navigation.lua b/lua/nvim-treesitter/refactor/navigation.lua
index 9c439179..5fd25e47 100644
--- a/lua/nvim-treesitter/refactor/navigation.lua
+++ b/lua/nvim-treesitter/refactor/navigation.lua
@@ -26,12 +26,6 @@ function M.goto_definition(bufnr)
   if not node_at_point then return end
 
   local definition, _ = ts_utils.find_definition(node_at_point, bufnr)
-
-  if not definition then
-    print('No definition found')
-    return
-  end
-
   local start_row, start_col, _ = definition:start()
 
   api.nvim_win_set_cursor(0, { start_row + 1, start_col })
diff --git a/lua/nvim-treesitter/refactor/smart_rename.lua b/lua/nvim-treesitter/refactor/smart_rename.lua
index 5b7562eb..8aab9538 100644
--- a/lua/nvim-treesitter/refactor/smart_rename.lua
+++ b/lua/nvim-treesitter/refactor/smart_rename.lua
@@ -3,6 +3,7 @@
 
 local ts_utils = require'nvim-treesitter.ts_utils'
 local configs = require'nvim-treesitter.configs'
+local utils = require'nvim-treesitter.utils'
 local api = vim.api
 
 local M = {}
@@ -12,7 +13,7 @@ function M.smart_rename(bufnr)
   local node_at_point = ts_utils.get_node_at_cursor()
 
   if not node_at_point then
-    print('No node to rename!')
+    utils.print_warning("No node to rename!")
     return
   end
 
@@ -29,23 +30,16 @@ function M.smart_rename(bufnr)
     table.insert(nodes_to_rename, node_at_point)
   end
 
-  if definition and not vim.tbl_contains(nodes_to_rename, definition) then
+  if not vim.tbl_contains(nodes_to_rename, definition) then
     table.insert(nodes_to_rename, definition)
   end
 
-  if #nodes_to_rename < 1 then
-    print('No nodes to rename!')
-    return
-  end
-
   for _, node in ipairs(nodes_to_rename) do
     local start_row, start_col, end_row, end_col = node:range() 
-
     local line = api.nvim_buf_get_lines(bufnr, start_row, start_row + 1, false)[1]
 
     if line then
       local new_line = line:sub(1, start_col) .. new_name .. line:sub(end_col + 1, -1)
-
       api.nvim_buf_set_lines(bufnr, start_row, start_row + 1, false, { new_line })
     end
   end
@@ -53,12 +47,10 @@ end
 
 function M.attach(bufnr)
   local bufnr = bufnr or api.nvim_get_current_buf()
-
   local config = configs.get_module('refactor.smart_rename')
 
   for fn_name, mapping in pairs(config.keymaps) do
     local cmd = string.format([[:lua require'nvim-treesitter.refactor.smart_rename'.%s(%d)<CR>]], fn_name, bufnr)
-
     api.nvim_buf_set_keymap(bufnr, 'n', mapping, cmd, { silent = true })
   end
 end