diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/lsp.txt | 13 | ||||
| -rw-r--r-- | runtime/doc/news.txt | 1 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/handlers.lua | 5 | ||||
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 17 |
4 files changed, 25 insertions, 11 deletions
diff --git a/runtime/doc/lsp.txt b/runtime/doc/lsp.txt index 9e6aec4bf7..954d21ec34 100644 --- a/runtime/doc/lsp.txt +++ b/runtime/doc/lsp.txt @@ -2376,14 +2376,17 @@ stylize_markdown({bufnr}, {contents}, {opts}) Return: ~ (`table`) stripped content -symbols_to_items({symbols}, {bufnr}) *vim.lsp.util.symbols_to_items()* + *vim.lsp.util.symbols_to_items()* +symbols_to_items({symbols}, {bufnr}, {position_encoding}) Converts symbols to quickfix list items. Parameters: ~ - • {symbols} (`lsp.DocumentSymbol[]|lsp.SymbolInformation[]`) list of - symbols - • {bufnr} (`integer?`) buffer handle or 0 for current, defaults to - current + • {symbols} (`lsp.DocumentSymbol[]|lsp.SymbolInformation[]`) + list of symbols + • {bufnr} (`integer?`) buffer handle or 0 for current, + defaults to current + • {position_encoding} (`'utf-8'|'utf-16'|'utf-32'?`) default to first + client of buffer Return: ~ (`vim.quickfix.entry[]`) See |setqflist()| for the format diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 8ab001bf94..92492d0448 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -133,6 +133,7 @@ LSP • |vim.lsp.util.make_position_params()|, |vim.lsp.util.make_range_params()| and |vim.lsp.util.make_given_range_params()| now require the `position_encoding` parameter. +• |vim.lsp.util.symbols_to_items()| now requires the `position_encoding` parameter. LUA diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua index b35140dfad..25f87a7164 100644 --- a/runtime/lua/vim/lsp/handlers.lua +++ b/runtime/lua/vim/lsp/handlers.lua @@ -231,7 +231,7 @@ end --- --- The returned function has an optional {config} parameter that accepts |vim.lsp.ListOpts| --- ----@param map_result fun(resp, bufnr: integer): table to convert the response +---@param map_result fun(resp, bufnr: integer, position_encoding: 'utf-8'|'utf-16'|'utf-32'): table to convert the response ---@param entity string name of the resource used in a `not found` error message ---@param title_fn fun(ctx: lsp.HandlerContext): string Function to call to generate list title ---@return lsp.Handler @@ -244,7 +244,8 @@ local function response_to_list(map_result, entity, title_fn) end config = config or {} local title = title_fn(ctx) - local items = map_result(result, ctx.bufnr) + local client = assert(vim.lsp.get_client_by_id(ctx.client_id)) + local items = map_result(result, ctx.bufnr, client.offset_encoding) local list = { title = title, items = items, context = ctx } if config.on_list then diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index e0d93ca75b..86c0a2b3db 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -1777,9 +1777,18 @@ end --- ---@param symbols lsp.DocumentSymbol[]|lsp.SymbolInformation[] list of symbols ---@param bufnr? integer buffer handle or 0 for current, defaults to current +---@param position_encoding? 'utf-8'|'utf-16'|'utf-32' +--- default to first client of buffer ---@return vim.quickfix.entry[] # See |setqflist()| for the format -function M.symbols_to_items(symbols, bufnr) +function M.symbols_to_items(symbols, bufnr, position_encoding) bufnr = vim._resolve_bufnr(bufnr) + if position_encoding == nil then + vim.notify_once( + 'symbols_to_items must be called with valid position encoding', + vim.log.levels.WARN + ) + position_encoding = vim.lsp.get_clients({ bufnr = 0 })[1].offset_encoding + end local items = {} --- @type vim.quickfix.entry[] for _, symbol in ipairs(symbols) do @@ -1800,9 +1809,9 @@ function M.symbols_to_items(symbols, bufnr) local kind = protocol.SymbolKind[symbol.kind] or 'Unknown' local lnum = range['start'].line + 1 - local col = range['start'].character + 1 + local col = get_line_byte_from_position(bufnr, range['start'], position_encoding) + 1 local end_lnum = range['end'].line + 1 - local end_col = range['end'].character + 1 + local end_col = get_line_byte_from_position(bufnr, range['end'], position_encoding) + 1 items[#items + 1] = { filename = filename, @@ -1816,7 +1825,7 @@ function M.symbols_to_items(symbols, bufnr) end if symbol.children then - list_extend(items, M.symbols_to_items(symbol.children, bufnr)) + list_extend(items, M.symbols_to_items(symbol.children, bufnr, position_encoding)) end end |