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

fix(lsp): change signature of buf_highlight_references (#16345)

Browse Source 
the prior signature did not assume an active language client
this function can now be used directly by passing an offset encoding
defaults to utf-16 (standard for LSP)
This commit is contained in:
Michael Lingelbach 2021-11-17 12:14:45 -08:00 committed by GitHub
parent c0efe49e78
commit eb3d59126e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/lua/vim/lsp/handlers.lua
View File

@ -350,7 +350,10 @@ M['textDocument/signatureHelp'] = M.signature_help
--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight
M['textDocument/documentHighlight'] = function(_, result, ctx, _) M['textDocument/documentHighlight'] = function(_, result, ctx, _)
if not result then return end if not result then return end
util.buf_highlight_references(ctx.bufnr, result, ctx.client_id) local client_id = ctx.client_id
local client = vim.lsp.get_client_by_id(client_id)
if not client then return end
util.buf_highlight_references(ctx.bufnr, result, client.offset_encoding)
end end
---@private ---@private

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

@ -1341,19 +1341,17 @@ do --[[ References ]]
--- ---
---@param bufnr buffer id ---@param bufnr buffer id
---@param references List of `DocumentHighlight` objects to highlight ---@param references List of `DocumentHighlight` objects to highlight
---@param offset_encoding string utf-8|utf-16|utf-32|nil defaults to utf-16
---@see https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#documentHighlight ---@see https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#documentHighlight
function M.buf_highlight_references(bufnr, references, client_id) function M.buf_highlight_references(bufnr, references, offset_encoding)
validate { bufnr = {bufnr, 'n', true} } validate { bufnr = {bufnr, 'n', true} }
local client = vim.lsp.get_client_by_id(client_id) offset_encoding = offset_encoding or 'utf-16'
if not client then
return
end
for _, reference in ipairs(references) do for _, reference in ipairs(references) do
local start_line, start_char = reference["range"]["start"]["line"], reference["range"]["start"]["character"] local start_line, start_char = reference["range"]["start"]["line"], reference["range"]["start"]["character"]
local end_line, end_char = reference["range"]["end"]["line"], reference["range"]["end"]["character"] local end_line, end_char = reference["range"]["end"]["line"], reference["range"]["end"]["character"]
local start_idx = get_line_byte_from_position(bufnr, { line = start_line, character = start_char }, client.offset_encoding) local start_idx = get_line_byte_from_position(bufnr, { line = start_line, character = start_char }, offset_encoding)
local end_idx = get_line_byte_from_position(bufnr, { line = start_line, character = end_char }, client.offset_encoding) local end_idx = get_line_byte_from_position(bufnr, { line = start_line, character = end_char }, offset_encoding)
local document_highlight_kind = { local document_highlight_kind = {
[protocol.DocumentHighlightKind.Text] = "LspReferenceText"; [protocol.DocumentHighlightKind.Text] = "LspReferenceText";