Skip to content

Improve language server capability handling #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2025
Merged

Improve language server capability handling #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions lua/navigator/lspclient/mapping.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ local remap = util.binding_remap
local key_maps = {
{ key = 'gr', func = require('navigator.reference').async_ref, desc = 'async_ref' },
{ key = '<Leader>gr', func = require('navigator.reference').reference, desc = 'reference' }, -- reference deprecated
{ key = '<M-k>', func = vim.lsp.buf.signature_help, desc = 'signature_help', mode = 'i' },
{ key = '<M-k>', func = vim.lsp.buf.signature_help, desc = 'signature_help', mode = 'i' },
{ key = '<c-k>', func = vim.lsp.buf.signature_help, desc = 'signature_help' },
{ key = '<Leader>g0', func = require('navigator.symbols').document_symbols, desc = 'document_symbols' },
{ key = 'gW', func = require('navigator.workspace').workspace_symbol_live, desc = 'workspace_symbol_live' },
{ key = '<c-]>', func = require('navigator.definition').definition, desc = 'definition' },
{ key = 'gd', func = remap(require('navigator.definition').definition, 'gd'), desc = 'definition' },
{ key = 'gD', func = vim.lsp.buf.declaration, desc = 'declaration', fallback = fallback_fn('gD') }, -- fallback used
{ key = 'gD', func = vim.lsp.buf.declaration, desc = 'declaration', fallback = fallback_fn('gD') }, -- fallback used
-- for lsp handler
{ key = 'gp', func = remap(require('navigator.definition').definition_preview, 'gp'), desc = 'definition_preview' }, -- paste
{ key = 'gP', func = remap(require('navigator.definition').type_definition_preview, 'gP'), desc = 'type_definition_preview' }, -- paste
{ key = 'gp', func = remap(require('navigator.definition').definition_preview, 'gp'), desc = 'definition_preview' }, -- paste
{ key = 'gP', func = remap(require('navigator.definition').type_definition_preview, 'gP'), desc = 'type_definition_preview' }, -- paste
{ key = '<Leader>gt', func = require('navigator.treesitter').buf_ts, desc = 'buf_ts' },
{ key = '<Leader>gT', func = require('navigator.treesitter').bufs_ts, desc = 'bufs_ts' },
{ key = '<Leader>ct', func = require('navigator.ctags').ctags, desc = 'ctags' },
{ key = '<Space>ca', func = require('navigator.codeAction').code_action, desc = 'code_action', mode = {'n', 'v'} },
{ key = '<Space>ca', func = require('navigator.codeAction').code_action, desc = 'code_action', mode = { 'n', 'v' } },
-- { key = '<Leader>re', func = 'rename()' },
{ key = '<Space>rn', func = require('navigator.rename').rename, desc = 'rename' },
{ key = '<Leader>gi', func = require('navigator.hierarchy').incoming_calls, desc = 'incoming_calls' },
{ key = '<Leader>go', func = require('navigator.hierarchy').outgoing_calls, desc = 'outgoing_calls' },
{ key = 'gi', func = require('navigator.implementation').implementation_call, desc = 'implementation', fallback = fallback_fn('gi') }, -- insert
{ key = '<Leader>gi', func = require('navigator.hierarchy').incoming_calls, desc = 'incoming_calls' },
{ key = '<Leader>go', func = require('navigator.hierarchy').outgoing_calls, desc = 'outgoing_calls' },
{ key = 'gi', func = require('navigator.implementation').implementation_call, desc = 'implementation', fallback = fallback_fn('gi') }, -- insert
{ key = '<Space>D', func = vim.lsp.buf.type_definition, desc = 'type_definition' },
{ key = 'gL', func = require('navigator.diagnostics').show_diagnostics, desc = 'show_diagnostics' },
{ key = 'gG', func = require('navigator.diagnostics').show_buf_diagnostics, desc = 'show_buf_diagnostics' },
Expand All @@ -60,15 +60,15 @@ local key_maps = {
{ key = ']O', func = vim.diagnostic.set_loclist, desc = 'diagnostics set loclist' },
{ key = ']r', func = require('navigator.treesitter').goto_next_usage, desc = 'goto_next_usage' },
{ key = '[r', func = require('navigator.treesitter').goto_previous_usage, desc = 'goto_previous_usage' },
{ key = '<C-LeftMouse>', func = vim.lsp.buf.definition, desc = 'definition', fallback = fallback_fn('<C-LeftMouse>')},
{ key = '<C-LeftMouse>', func = vim.lsp.buf.definition, desc = 'definition', fallback = fallback_fn('<C-LeftMouse>') },
{ key = 'g<LeftMouse>', func = vim.lsp.buf.implementation, desc = 'implementation' },
{ key = '<Leader>k', func = require('navigator.dochighlight').hi_symbol, desc = 'hi_symbol' },
{ key = '<Space>wa', func = require('navigator.workspace').add_workspace_folder, desc = 'add_workspace_folder' },
{ key = '<Space>wr', func = require('navigator.workspace').remove_workspace_folder, desc = 'remove_workspace_folder' },
{ key = '<Space>ff', func = vim.lsp.buf.format, desc = 'format', mode = {'n', 'v', 'x'} },
{ key = '<Space>gm', func = require('navigator.formatting').range_format, mode = 'n', desc = 'range format operator e.g gmip' },
{ key = '<Space>ff', func = vim.lsp.buf.format, desc = 'format', mode = { 'n', 'v', 'x' } },
{ key = '<Space>gm', func = require('navigator.formatting').range_format, mode = 'n', desc = 'range format operator e.g gmip' },
{ key = '<Space>wl', func = require('navigator.workspace').list_workspace_folders, desc = 'list_workspace_folders' },
{ key = '<Space>la', func = require('navigator.codelens').run_action, desc = 'run code lens action', mode = 'n'}
{ key = '<Space>la', func = require('navigator.codelens').run_action, desc = 'run code lens action', mode = 'n' }
-- stylua: ignore end
}

Expand All @@ -95,7 +95,7 @@ local ccls_mappings = {

local check_cap = function(opts)
-- log(vim.lsp.get_clients({buffer = 0}))
local fmt, rfmt, ccls
local fmt, rfmt, ccls = false, false, false
local cap = opts.cap
if cap == nil then
if opts.client and opts.client.server_capabilities then
Expand All @@ -110,7 +110,7 @@ local check_cap = function(opts)
end
for _, value in pairs(vim.lsp.get_clients({ buffer = 0 })) do
trace(value)
if value ~= nil and value.server_capabilities == nil then
if value ~= nil and value.server_capabilities ~= nil then
if value.server_capabilities.documentFormattingProvider then
fmt = true
end
Expand Down Expand Up @@ -348,7 +348,7 @@ function M.setup(attach_opts)
attach_opts = attach_opts or {}
-- extend the default mapping
attach_opts = vim.tbl_deep_extend('force', { bufnr = vim.api.nvim_get_current_buf(), client = {}, cap = {} },
attach_opts)
attach_opts)

set_mapping(attach_opts)
set_cmds(attach_opts)
Expand Down Expand Up @@ -377,12 +377,12 @@ function M.setup(attach_opts)
for _, value in pairs(key_maps) do
if value.func == vim.lsp.buf.definition then
vim.lsp.handlers['textDocument/definition'] = util.mk_handler_remap(
require('navigator.definition').definition_handler, value.fallback)
require('navigator.definition').definition_handler, value.fallback)
end

if value.func == vim.lsp.buf.type_definition then
vim.lsp.handlers['textDocument/typeDefinition'] = util.mk_handler_remap(
require('navigator.definition').definition_handler, value.fallback)
require('navigator.definition').definition_handler, value.fallback)
end
end
else
Expand Down
Loading