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

Merge pull request #14232 from mjlbach/fix_utf16_ranges_again

Browse Source 
lsp: fix utf-16 ranges to use second return value for incremental sync
This commit is contained in:
Michael Lingelbach 2021-03-28 03:02:29 -07:00 committed by GitHub
commit 2ed5a77602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,13 +373,13 @@ function M.compute_diff(old_lines, new_lines, start_line_idx, end_line_idx)
adj_end_char = #old_lines[#old_lines + end_line + 1] + end_char + 1 adj_end_char = #old_lines[#old_lines + end_line + 1] + end_char + 1
end end
start_char = vim.str_utfindex(old_lines[start_line], start_char - 1) local _, utf16_start_char = vim.str_utfindex(old_lines[start_line], start_char - 1)
adj_end_char = vim.str_utfindex(old_lines[#old_lines + end_line + 1], adj_end_char) local _, utf16_end_char = vim.str_utfindex(old_lines[#old_lines + end_line + 1], adj_end_char)
local result = { local result = {
range = { range = {
start = { line = start_line - 1, character = start_char}, start = { line = start_line - 1, character = utf16_start_char},
["end"] = { line = adj_end_line, character = adj_end_char} ["end"] = { line = adj_end_line, character = utf16_end_char}
}, },
text = text, text = text,
rangeLength = length + 1, rangeLength = length + 1,