Skip to content

Commit

Permalink
feat(lsp): make list handlers configurable (neovim#15199)
Browse files Browse the repository at this point in the history
The handlers for textDocument/references, textDocument/documentSymbol,
and workspace/symbol open their results in the quickfix list by default
and are not configurable. They are also incompatible with `vim.lsp.with`
as they do not accept a configuration parameter.

Add a `config` parameter to the handler for these three messages which
allows them to be configured with `vim.lsp.with`. Additionally, add a
new configuration option 'loclist' that, when true, causes these
handlers to open their results in the location list rather than the
quickfix list.
  • Loading branch information
gpanders committed Jul 26, 2021
1 parent b8813ba commit 3e00d4f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 11 deletions.
12 changes: 12 additions & 0 deletions runtime/doc/lsp.txt
Expand Up @@ -321,6 +321,18 @@ To configure the behavior of a builtin |lsp-handler|, the convenient method
),
}
}
<
Some handlers do not have an explicitly named handler function (such as
|on_publish_diagnostics()|). To override these, first create a reference
to the existing handler: >
local on_references = vim.lsp.handlers["textDocument/references"]
vim.lsp.handlers["textDocument/references"] = vim.lsp.with(
on_references, {
-- Use location list instead of quickfix list
loclist = true,
}
)
<
*lsp-handler-resolution*
Handlers can be set by:
Expand Down
33 changes: 22 additions & 11 deletions runtime/lua/vim/lsp/handlers.lua
Expand Up @@ -190,30 +190,41 @@ end


--@private
--- Return a function that converts LSP responses to quickfix items and opens the qflist
--
--@param map_result function `((resp, bufnr) -> list)` to convert the response
--@param entity name of the resource used in a `not found` error message
local function response_to_qflist(map_result, entity)
return function(_, _, result, _, bufnr)
--- Return a function that converts LSP responses to list items and opens the list
---
--- The returned function has an optional {config} parameter that accepts a table
--- with the following keys:
---
--- loclist: (boolean) use the location list (default is to use the quickfix list)
---
--- @param map_result function `((resp, bufnr) -> list)` to convert the response
--- @param entity name of the resource used in a `not found` error message
local function response_to_list(map_result, entity)
return function(_, _, result, _, bufnr, config)
if not result or vim.tbl_isempty(result) then
vim.notify('No ' .. entity .. ' found')
else
util.set_qflist(map_result(result, bufnr))
api.nvim_command("copen")
config = config or {}
if config.loclist then
util.set_loclist(map_result(result, bufnr))
api.nvim_command("lopen")
else
util.set_qflist(map_result(result, bufnr))
api.nvim_command("copen")
end
end
end
end


--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_references
M['textDocument/references'] = response_to_qflist(util.locations_to_items, 'references')
M['textDocument/references'] = response_to_list(util.locations_to_items, 'references')

--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentSymbol
M['textDocument/documentSymbol'] = response_to_qflist(util.symbols_to_items, 'document symbols')
M['textDocument/documentSymbol'] = response_to_list(util.symbols_to_items, 'document symbols')

--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#workspace_symbol
M['workspace/symbol'] = response_to_qflist(util.symbols_to_items, 'symbols')
M['workspace/symbol'] = response_to_list(util.symbols_to_items, 'symbols')

--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_rename
M['textDocument/rename'] = function(_, _, result)
Expand Down

0 comments on commit 3e00d4f

Please sign in to comment.