use show_document instead of jump to location

ray-x · Jan 10, 2025 · eb8216a · eb8216a
1 parent b1d0da4
commit eb8216a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/lua/navigator.lua b/lua/navigator.lua
@@ -153,10 +153,6 @@ _NgConfigValues = {
     diagnostic_virtual_text = true, -- show virtual for diagnostic message
     diagnostic_update_in_insert = false, -- update diagnostic message in insert mode
     diagnostic_scrollbar_sign = { '▃', '▆', '█' }, -- set to nil to disable, set to {'╍', 'ﮆ'} to enable diagnostic status in scroll bar area
-    tsserver = {
-      -- filetypes = {'typescript'} -- disable javascript etc,
-      -- set to {} to disable the lspclient for all filetype
-    },
     neodev = false,
     lua_ls = {
       -- sumneko_root_path = sumneko_root_path,

diff --git a/lua/navigator/definition.lua b/lua/navigator/definition.lua
@@ -24,7 +24,7 @@ local definition_hdlr = function(err, locations, ctx, _)
     return
   end
 
-  local oe = require('navigator.util').encoding(ctx.client_id)
+  local enc = require('navigator.util').encoding(ctx.client_id)
 
   locations = util.dedup(locations)
   log(locations)
@@ -43,7 +43,7 @@ local definition_hdlr = function(err, locations, ctx, _)
       then
         vim.lsp.buf.type_definition()
       else
-        vim.lsp.util.jump_to_location(locations[1], oe)
+        vim.lsp.util.show_document(locations[1], enc, { focus = true })
       end
     end
   else
@@ -191,8 +191,8 @@ local def = function()
   local bufnr = vim.api.nvim_get_current_buf()
 
   local ref_params = vim.lsp.util.make_position_params()
+  -- check if the pos is already a definition with treesitter
   util.for_each_buffer_client(bufnr, function(client, _, _bufnr)
-    -- if client.resolved_capabilities.goto_definition then
     if client.server_capabilities.definitionProvider then
       client.request('textDocument/definition', ref_params, definition_hdlr, _bufnr)
       return

diff --git a/lua/navigator/treesitter.lua b/lua/navigator/treesitter.lua
@@ -35,8 +35,8 @@ local get_icon = function(kind)
     return _NgConfigValues.icons.match_kinds[kind]
   end
 end
--- require'navigator.treesitter'.goto_definition()
-function M.goto_definition(bufnr)
+
+function M.is_definition(bufnr)
   bufnr = bufnr or api.nvim_get_current_buf()
   local node_at_point = ts_utils.get_node_at_cursor()
 
@@ -46,7 +46,12 @@ function M.goto_definition(bufnr)
 
   local definition = locals.find_definition(node_at_point, bufnr)
 
-  if definition ~= node_at_point then
+  return definition == node_at_point
+end
+
+function M.goto_definition(bufnr)
+  if not M.is_definition(bufnr) then
+    local definition = locals.find_definition(node_at_point, bufnr)
     log('def found:', definition:range())
     ts_utils.goto_node(definition)
   end