IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(lsp): include end_col and end_lnum in vim.lsp.buf.symbols_to_items

Browse Source
This commit is contained in:
Yi Ming 2025-02-11 17:09:39 +08:00
parent f8cbdbb4a8
commit 6722149776
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/lsp.txt
View File

@ -2380,8 +2380,10 @@ symbols_to_items({symbols}, {bufnr}) *vim.lsp.util.symbols_to_items()*
Converts symbols to quickfix list items. Converts symbols to quickfix list items.
Parameters: ~ Parameters: ~
• {symbols} (`lsp.DocumentSymbol[]|lsp.SymbolInformation[]`) • {symbols} (`lsp.DocumentSymbol[]|lsp.SymbolInformation[]`) list of
• {bufnr} (`integer?`) symbols
• {bufnr} (`integer?`) buffer handle or 0 for current, defaults to
current
Return: ~ Return: ~
(`vim.quickfix.entry[]`) See |setqflist()| for the format (`vim.quickfix.entry[]`) See |setqflist()| for the format

3
runtime/doc/news.txt
View File

@ -277,7 +277,8 @@ LSP
• `:checkhealth vim.lsp` displays the server version (if available). • `:checkhealth vim.lsp` displays the server version (if available).
• Completion side effects (including snippet expansion, execution of commands • Completion side effects (including snippet expansion, execution of commands
and application of additional text edits) is now built-in. and application of additional text edits) is now built-in.
• |vim.lsp.util.locations_to_items()| sets `end_col` and `end_lnum` fields. • |vim.lsp.util.locations_to_items()| and |vim.lsp.util.symbols_to_items()| now
sets `end_col` and `end_lnum` fields.
• |vim.lsp.buf.format()| now supports passing a list of ranges • |vim.lsp.buf.format()| now supports passing a list of ranges
via the `range` parameter (this requires support for the via the `range` parameter (this requires support for the
`textDocument/rangesFormatting` request). `textDocument/rangesFormatting` request).

29
runtime/lua/vim/lsp/util.lua
View File

@ -1775,32 +1775,41 @@ end
--- Converts symbols to quickfix list items. --- Converts symbols to quickfix list items.
--- ---
---@param symbols lsp.DocumentSymbol[]|lsp.SymbolInformation[] ---@param symbols lsp.DocumentSymbol[]|lsp.SymbolInformation[] list of symbols
---@param bufnr? integer ---@param bufnr? integer buffer handle or 0 for current, defaults to current
---@return vim.quickfix.entry[] # See |setqflist()| for the format ---@return vim.quickfix.entry[] # See |setqflist()| for the format
function M.symbols_to_items(symbols, bufnr) function M.symbols_to_items(symbols, bufnr)
bufnr = bufnr or 0 bufnr = vim._resolve_bufnr(bufnr)
local items = {} --- @type vim.quickfix.entry[] local items = {} --- @type vim.quickfix.entry[]
for _, symbol in ipairs(symbols) do for _, symbol in ipairs(symbols) do
--- @type string?, lsp.Position? --- @type string?, lsp.Range?
local filename, pos local filename, range
if symbol.location then if symbol.location then
--- @cast symbol lsp.SymbolInformation --- @cast symbol lsp.SymbolInformation
filename = vim.uri_to_fname(symbol.location.uri) filename = vim.uri_to_fname(symbol.location.uri)
pos = symbol.location.range.start range = symbol.location.range
elseif symbol.selectionRange then elseif symbol.selectionRange then
--- @cast symbol lsp.DocumentSymbol --- @cast symbol lsp.DocumentSymbol
filename = api.nvim_buf_get_name(bufnr) filename = api.nvim_buf_get_name(bufnr)
pos = symbol.selectionRange.start range = symbol.selectionRange
end end
if filename and pos then if filename and range then
local kind = protocol.SymbolKind[symbol.kind] or 'Unknown' local kind = protocol.SymbolKind[symbol.kind] or 'Unknown'
local lnum = range['start'].line + 1
local col = range['start'].character + 1
local end_lnum = range['end'].line + 1
local end_col = range['end'].character + 1
items[#items + 1] = { items[#items + 1] = {
filename = filename, filename = filename,
lnum = pos.line + 1, lnum = lnum,
col = pos.character + 1, col = col,
end_lnum = end_lnum,
end_col = end_col,
kind = kind, kind = kind,
text = '[' .. kind .. '] ' .. symbol.name, text = '[' .. kind .. '] ' .. symbol.name,
} }