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

fix(lsp): convert range to byte index before highlighting (#16218)

Browse Source 
Co-authored-by: Mathias Fußenegger <mfussenegger@users.noreply.github.com>
Co-authored-by: Michael Lingelbach <m.j.lbach@gmail.com>
This commit is contained in:
elianiva 2021-11-07 05:05:52 +07:00 committed by GitHub
parent 77c54fc995
commit b74916cfd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ 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) util.buf_highlight_references(ctx.bufnr, result, ctx.client_id)
end end
---@private ---@private

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

@ -151,8 +151,7 @@ end
--- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position
--- Returns a zero-indexed column, since set_lines() does the conversion to --- Returns a zero-indexed column, since set_lines() does the conversion to
--- 1-indexed --- 1-indexed
local function get_line_byte_from_position(bufnr, position) local function get_line_byte_from_position(bufnr, position, offset_encoding)
-- TODO handle offset_encoding
-- LSP's line and characters are 0-indexed -- LSP's line and characters are 0-indexed
-- Vim's line and columns are 1-indexed -- Vim's line and columns are 1-indexed
local col = position.character local col = position.character
@ -166,7 +165,13 @@ local function get_line_byte_from_position(bufnr, position)
local line = position.line local line = position.line
local lines = api.nvim_buf_get_lines(bufnr, line, line + 1, false) local lines = api.nvim_buf_get_lines(bufnr, line, line + 1, false)
if #lines > 0 then if #lines > 0 then
local ok, result = pcall(vim.str_byteindex, lines[1], col, true) local ok, result
if offset_encoding == "utf-16" or not offset_encoding then
ok, result = pcall(vim.str_byteindex, lines[1], col, true)
elseif offset_encoding == "utf-32" then
ok, result = pcall(vim.str_byteindex, lines[1], col, false)
end
if ok then if ok then
return result return result
@ -1497,18 +1502,30 @@ 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
---@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) function M.buf_highlight_references(bufnr, references, client_id)
validate { bufnr = {bufnr, 'n', true} } validate { bufnr = {bufnr, 'n', true} }
local client = vim.lsp.get_client_by_id(client_id)
if not client then
return
end
for _, reference in ipairs(references) do for _, reference in ipairs(references) do
local start_pos = {reference["range"]["start"]["line"], reference["range"]["start"]["character"]} local start_line, start_char = reference["range"]["start"]["line"], reference["range"]["start"]["character"]
local end_pos = {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 end_idx = get_line_byte_from_position(bufnr, { line = start_line, character = end_char }, client.offset_encoding)
local document_highlight_kind = { local document_highlight_kind = {
[protocol.DocumentHighlightKind.Text] = "LspReferenceText"; [protocol.DocumentHighlightKind.Text] = "LspReferenceText";
[protocol.DocumentHighlightKind.Read] = "LspReferenceRead"; [protocol.DocumentHighlightKind.Read] = "LspReferenceRead";
[protocol.DocumentHighlightKind.Write] = "LspReferenceWrite"; [protocol.DocumentHighlightKind.Write] = "LspReferenceWrite";
} }
local kind = reference["kind"] or protocol.DocumentHighlightKind.Text local kind = reference["kind"] or protocol.DocumentHighlightKind.Text
highlight.range(bufnr, reference_ns, document_highlight_kind[kind], start_pos, end_pos) highlight.range(bufnr,
reference_ns,
document_highlight_kind[kind],
{ start_line, start_idx },
{ end_line, end_idx })
end end
end end
end end