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

Refactor fetching the line byte

Browse Source 
Takes the entire LSP position instead of line/col
This commit is contained in:
Andreas Johansson 2020-05-19 08:49:13 +02:00
parent a6be7a9180
commit 131063e08f
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,17 +94,23 @@ local edit_sort_key = sort_by_key(function(e)
return {e.A[1], e.A[2], e.i} return {e.A[1], e.A[2], e.i}
end) end)
local function get_line_byte_from_line_character(bufnr, lnum, cnum) --- Position is a https://microsoft.github.io/language-server-protocol/specifications/specification-current/#position
-- Skip check when the byte and character position is the same -- Returns a zero-indexed column, since set_lines() does the conversion to
if cnum > 0 then -- 1-indexed
local lines = api.nvim_buf_get_lines(bufnr, lnum, lnum+1, false) local function get_line_byte_from_position(bufnr, position)
-- LSP's line and characters are 0-indexed
-- Vim's line and columns are 1-indexed
local col = position.character
-- When on the first character, we can ignore the difference between byte and
-- character
if col > 0 then
local line = position.line
local lines = api.nvim_buf_get_lines(bufnr, line, line + 1, false)
if #lines > 0 then if #lines > 0 then
return vim.str_byteindex(lines[1], cnum) return vim.str_byteindex(lines[1], col)
end end
end end
return col
return cnum
end end
function M.apply_text_edits(text_edits, bufnr) function M.apply_text_edits(text_edits, bufnr)
@ -117,15 +123,9 @@ function M.apply_text_edits(text_edits, bufnr)
for i, e in ipairs(text_edits) do for i, e in ipairs(text_edits) do
-- adjust start and end column for UTF-16 encoding of non-ASCII characters -- adjust start and end column for UTF-16 encoding of non-ASCII characters
local start_row = e.range.start.line local start_row = e.range.start.line
local start_col = get_line_byte_from_line_character( local start_col = get_line_byte_from_position(bufnr, e.range.start)
bufnr,
start_row,
e.range.start.character)
local end_row = e.range["end"].line local end_row = e.range["end"].line
local end_col = get_line_byte_from_line_character( local end_col = get_line_byte_from_position(bufnr, e.range['end'])
bufnr,
end_row,
e.range["end"].character)
start_line = math.min(e.range.start.line, start_line) start_line = math.min(e.range.start.line, start_line)
finish_line = math.max(e.range["end"].line, finish_line) finish_line = math.max(e.range["end"].line, finish_line)
-- TODO(ashkan) sanity check ranges for overlap. -- TODO(ashkan) sanity check ranges for overlap.