mirror of
https://github.com/neovim/neovim.git
synced 2024-12-19 18:55:14 -07:00
feat(lsp): add client command support to codelens (#15820)
Also adds a check against the server capabilities to fix https://github.com/neovim/neovim/issues/15183
This commit is contained in:
parent
ff18a8bcc4
commit
19a77cd5a7
@ -31,10 +31,24 @@ local function execute_lens(lens, bufnr, client_id)
|
||||
local line = lens.range.start.line
|
||||
api.nvim_buf_clear_namespace(bufnr, namespaces[client_id], line, line + 1)
|
||||
|
||||
local command = lens.command
|
||||
local fn = vim.lsp.commands[command.command]
|
||||
if fn then
|
||||
fn(command, { bufnr = bufnr, client_id = client_id })
|
||||
return
|
||||
end
|
||||
-- Need to use the client that returned the lens → must not use buf_request
|
||||
local client = vim.lsp.get_client_by_id(client_id)
|
||||
assert(client, 'Client is required to execute lens, client_id=' .. client_id)
|
||||
client.request('workspace/executeCommand', lens.command, function(...)
|
||||
local command_provider = client.server_capabilities.executeCommandProvider
|
||||
local commands = type(command_provider) == 'table' and command_provider.commands or {}
|
||||
if not vim.tbl_contains(commands, command.command) then
|
||||
vim.notify(string.format(
|
||||
"Language server does not support command `%s`. This command may require a client extension.", command.command),
|
||||
vim.log.levels.WARN)
|
||||
return
|
||||
end
|
||||
client.request('workspace/executeCommand', command, function(...)
|
||||
local result = vim.lsp.handlers['workspace/executeCommand'](...)
|
||||
M.refresh()
|
||||
return result
|
||||
|
@ -58,5 +58,33 @@ describe('vim.lsp.codelens', function()
|
||||
]], bufnr)
|
||||
|
||||
eq({[1] = {'Lens1', 'LspCodeLens'}}, virtual_text_chunks)
|
||||
|
||||
end)
|
||||
it('codelens uses client commands', function()
|
||||
local fake_uri = "file:///fake/uri"
|
||||
local cmd = exec_lua([[
|
||||
fake_uri = ...
|
||||
local bufnr = vim.uri_to_bufnr(fake_uri)
|
||||
vim.fn.bufload(bufnr)
|
||||
vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {'One line'})
|
||||
local lenses = {
|
||||
{
|
||||
range = {
|
||||
start = { line = 0, character = 0, },
|
||||
['end'] = { line = 0, character = 8 }
|
||||
},
|
||||
command = { title = 'Lens1', command = 'Dummy' }
|
||||
},
|
||||
}
|
||||
vim.lsp.codelens.on_codelens(nil, lenses, {method='textDocument/codeLens', client_id=1, bufnr=bufnr})
|
||||
local cmd_called = nil
|
||||
vim.lsp.commands['Dummy'] = function(command)
|
||||
cmd_called = command
|
||||
end
|
||||
vim.api.nvim_set_current_buf(bufnr)
|
||||
vim.lsp.codelens.run()
|
||||
return cmd_called
|
||||
]], fake_uri)
|
||||
eq({ command = 'Dummy', title = 'Lens1' }, cmd)
|
||||
end)
|
||||
end)
|
||||
|
Loading…
Reference in New Issue
Block a user