kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lsp): use supports_method where applicable

Browse Source
This commit is contained in:
Ilia Choly 2024-05-19 13:03:06 -04:00 committed by Lewis Russell
parent 10601ac5fa
commit 339129ebc9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/lua/vim/lsp.lua
View File

@ -66,6 +66,10 @@ lsp._request_name_to_capability = {
[ms.inlayHint_resolve] = { 'inlayHintProvider', 'resolveProvider' }, [ms.inlayHint_resolve] = { 'inlayHintProvider', 'resolveProvider' },
[ms.textDocument_documentLink] = { 'documentLinkProvider' }, [ms.textDocument_documentLink] = { 'documentLinkProvider' },
[ms.documentLink_resolve] = { 'documentLinkProvider', 'resolveProvider' }, [ms.documentLink_resolve] = { 'documentLinkProvider', 'resolveProvider' },
[ms.textDocument_didClose] = { 'textDocumentSync', 'openClose' },
[ms.textDocument_didOpen] = { 'textDocumentSync', 'openClose' },
[ms.textDocument_willSave] = { 'textDocumentSync', 'willSave' },
[ms.textDocument_willSaveWaitUntil] = { 'textDocumentSync', 'willSaveWaitUntil' },
} }
-- TODO improve handling of scratch buffers with LSP attached. -- TODO improve handling of scratch buffers with LSP attached.
@ -522,10 +526,10 @@ local function buf_attach(bufnr)
}, },
reason = protocol.TextDocumentSaveReason.Manual, ---@type integer reason = protocol.TextDocumentSaveReason.Manual, ---@type integer
} }
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'willSave') then if client.supports_method(ms.textDocument_willSave) then
client.notify(ms.textDocument_willSave, params) client.notify(ms.textDocument_willSave, params)
end end
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'willSaveWaitUntil') then if client.supports_method(ms.textDocument_willSaveWaitUntil) then
local result, err = local result, err =
client.request_sync(ms.textDocument_willSaveWaitUntil, params, 1000, ctx.buf) client.request_sync(ms.textDocument_willSaveWaitUntil, params, 1000, ctx.buf)
if result and result.result then if result and result.result then
@ -560,7 +564,7 @@ local function buf_attach(bufnr)
local params = { textDocument = { uri = uri } } local params = { textDocument = { uri = uri } }
for _, client in ipairs(clients) do for _, client in ipairs(clients) do
changetracking.reset_buf(client, bufnr) changetracking.reset_buf(client, bufnr)
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then if client.supports_method(ms.textDocument_didClose) then
client.notify(ms.textDocument_didClose, params) client.notify(ms.textDocument_didClose, params)
end end
end end
@ -573,7 +577,7 @@ local function buf_attach(bufnr)
local params = { textDocument = { uri = uri } } local params = { textDocument = { uri = uri } }
for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do for _, client in ipairs(lsp.get_clients({ bufnr = bufnr })) do
changetracking.reset_buf(client, bufnr) changetracking.reset_buf(client, bufnr)
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then if client.supports_method(ms.textDocument_didClose) then
client.notify(ms.textDocument_didClose, params) client.notify(ms.textDocument_didClose, params)
end end
end end
@ -665,7 +669,7 @@ function lsp.buf_detach_client(bufnr, client_id)
changetracking.reset_buf(client, bufnr) changetracking.reset_buf(client, bufnr)
if vim.tbl_get(client.server_capabilities, 'textDocumentSync', 'openClose') then if client.supports_method(ms.textDocument_didClose) then
local uri = vim.uri_from_bufnr(bufnr) local uri = vim.uri_from_bufnr(bufnr)
local params = { textDocument = { uri = uri } } local params = { textDocument = { uri = uri } }
client.notify(ms.textDocument_didClose, params) client.notify(ms.textDocument_didClose, params)

2
runtime/lua/vim/lsp/client.lua
View File

@ -905,7 +905,7 @@ end
--- @param bufnr integer Number of the buffer, or 0 for current --- @param bufnr integer Number of the buffer, or 0 for current
function Client:_text_document_did_open_handler(bufnr) function Client:_text_document_did_open_handler(bufnr)
changetracking.init(self, bufnr) changetracking.init(self, bufnr)
if not vim.tbl_get(self.server_capabilities, 'textDocumentSync', 'openClose') then if not self.supports_method(ms.textDocument_didOpen) then
return return
end end
if not api.nvim_buf_is_loaded(bufnr) then if not api.nvim_buf_is_loaded(bufnr) then