GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lsp): simplify multiline semantic token logic #34698

Browse Source 
This commit makes it so that only one call to `vim.str_byteindex` is
needed, at the end of the `end_line`, `end_col` calculations.
This commit is contained in:
Riley Bruins
2025-07-10 11:12:18 -07:00
committed by GitHub
parent 4745270bf1
commit 7bd4dfd209
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,17 +152,19 @@ local function tokens_to_ranges(data, bufnr, client, request)
local buf_line = lines[line + 1] or ''
local end_line = line ---@type integer
local start_col = vim.str_byteindex(buf_line, encoding, start_char, false)
local end_col = vim.str_byteindex(buf_line, encoding, end_char, false)
end_char = end_char - vim.str_utfindex(buf_line, encoding) - eol_offset
---@type integer LuaLS bug, type must be marked explicitly here
local new_end_char = end_char - vim.str_utfindex(buf_line, encoding) - eol_offset
-- While end_char goes past the given line, extend the token range to the next line
while end_char > 0 do
while new_end_char > 0 do
end_char = new_end_char
end_line = end_line + 1
buf_line = lines[end_line + 1] or ''
end_col = vim.str_byteindex(buf_line, encoding, end_char, false)
end_char = end_char - vim.str_utfindex(buf_line, encoding) - eol_offset
new_end_char = new_end_char - vim.str_utfindex(buf_line, encoding) - eol_offset
end
local end_col = vim.str_byteindex(buf_line, encoding, end_char, false)
ranges[#ranges + 1] = {
line = line,
end_line = end_line,