From 74bbb26cfbc6736794dc59de464d6a1b1dca8064 Mon Sep 17 00:00:00 2001 From: Michiel van den Heuvel Date: Tue, 4 Feb 2025 12:14:23 +0100 Subject: Change vis_sel_to_pos to count lines itself This avoids the screen scrolling when receiving diagnostics from the server, which currently means that saving the file randomly centers the cursor. This is a first version, I think that an optimisation is possible where it doesn't loop through the file for every selection, but loops once, converting every selection passed. --- init.lua | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 3674990..134a59e 100644 --- a/init.lua +++ b/init.lua @@ -141,16 +141,17 @@ local function get_selection(win) end -- get the 0-based byte offset from a selection --- ATTENTION: this function modifies the primary selection so it is not --- safe to call it for example during WIN_HIGHLIGHT events -local function vis_sel_to_pos(win, selection) - local old_selection = get_selection(win) - -- move primary selection - win.selection:to(selection.line, selection.col) - local pos = win.selection.pos - -- restore old primary selection - win.selection:to(old_selection.line, old_selection.col) - return pos +local function vis_sel_to_pos(file, sel) + local line_count = 0 + local pos = 0 + for line in file:lines_iterator() do + line_count = line_count + 1 + if line_count == sel.line then + return pos + (sel.col - 1) + end + pos = pos + #line + 1 + end + return 0 end -- get the line and column from a 0-based byte offset @@ -204,14 +205,12 @@ local function vis_get_doc_pos(win) end -- convert a lsp_range to a vis_range --- ATTENTION: this function modifies the primary selection so it is not --- safe to call it for example during WIN_HIGHLIGHT events -local function lsp_range_to_vis_range(win, lsp_range) +local function lsp_range_to_vis_range(file, lsp_range) local start = lsp_pos_to_vis_sel(lsp_range.start) - local start_pos = vis_sel_to_pos(win, start) + local start_pos = vis_sel_to_pos(file, start) local finish = lsp_pos_to_vis_sel(lsp_range['end']) - local finish_pos = vis_sel_to_pos(win, finish) + local finish_pos = vis_sel_to_pos(file, finish) return {start = start_pos, finish = finish_pos} end @@ -420,7 +419,7 @@ end local function vis_apply_textEdit(win, file, textEdit) assert(win.file == file) - local range = lsp_range_to_vis_range(win, textEdit.range) + local range = lsp_range_to_vis_range(file, textEdit.range) file:delete(range) file:insert(range.start, textEdit.newText) @@ -437,7 +436,7 @@ local function vis_apply_textEdits(win, file, textEdits) local edits = {} for _, textEdit in ipairs(textEdits) do - local range = lsp_range_to_vis_range(win, textEdit.range) + local range = lsp_range_to_vis_range(file, textEdit.range) table.insert(edits, { mark = file:mark_set(range.start), len = range.finish - range.start, @@ -1056,9 +1055,8 @@ local function lspc_handle_publish_diagnostics(ls, uri, diagnostics) if file then for _, diagnostic in ipairs(diagnostics) do -- We convert the lsp_range to a vis_range here to do it only once. - -- And because we can't do it during a WIN_HIGHLIGHT events because - -- lsp_range_to_vis_range modifies the primary selection - diagnostic.vis_range = lsp_range_to_vis_range(vis.win, diagnostic.range) + -- It's an expensive operation that involves counting all newlines. + diagnostic.vis_range = lsp_range_to_vis_range(file.file, diagnostic.range) -- In some instances the range defined by the diagnostic starts -- and ends at the same position. Highlight the exact position. -- cgit v1.2.3 From 71e6e1787a8caaceace53f0fe658da7a8f6debec Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 12 Feb 2025 17:26:12 +0100 Subject: move file location converters functions into util module Use the the internal vis logic as fast path if available. --- init.lua | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 134a59e..99cb3cb 100644 --- a/init.lua +++ b/init.lua @@ -140,33 +140,6 @@ local function get_selection(win) return {line = win.selection.line, col = win.selection.col} end --- get the 0-based byte offset from a selection -local function vis_sel_to_pos(file, sel) - local line_count = 0 - local pos = 0 - for line in file:lines_iterator() do - line_count = line_count + 1 - if line_count == sel.line then - return pos + (sel.col - 1) - end - pos = pos + #line + 1 - end - return 0 -end - --- get the line and column from a 0-based byte offset --- ATTENTION: this function modifies the primary selection so it is not --- safe to call it for example during WIN_HIGHLIGHT events -local function vis_pos_to_sel(win, pos) - local old_selection = get_selection(win) - -- move primary selection - win.selection.pos = pos - local sel = get_selection(win) - -- restore old primary selection - win.selection:to(old_selection.line, old_selection.col) - return sel -end - -- convert lsp_position to vis_selection local function lsp_pos_to_vis_sel(pos) return {line = pos.line + 1, col = pos.character + 1} @@ -207,10 +180,10 @@ end -- convert a lsp_range to a vis_range local function lsp_range_to_vis_range(file, lsp_range) local start = lsp_pos_to_vis_sel(lsp_range.start) - local start_pos = vis_sel_to_pos(file, start) + local start_pos = util.vis_sel_to_pos(file, start) local finish = lsp_pos_to_vis_sel(lsp_range['end']) - local finish_pos = vis_sel_to_pos(file, finish) + local finish_pos = util.vis_sel_to_pos(file, finish) return {start = start_pos, finish = finish_pos} end @@ -864,7 +837,7 @@ local function lspc_handle_hover_method_response(win, result, old_pos) return end - local sel = vis_pos_to_sel(win, old_pos) + local sel = util.vis_pos_to_sel(win, old_pos) local hover_header = '--- hover: ' .. (win.file.path or '') .. ': ' .. sel.line .. ', ' .. sel.col .. ' ---\n' @@ -900,7 +873,7 @@ local function lspc_handle_signature_help_method_response(win, result, call_pos) local signatures = result.signatures - local sel = vis_pos_to_sel(win, call_pos) + local sel = util.vis_pos_to_sel(win, call_pos) local help_header = '--- signature help: ' .. (win.file.path or '') .. ': ' .. sel.line .. ', ' .. sel.col .. ' ---\n' -- cgit v1.2.3 From f5c20434eaeb3e22cc50864d08878adef39fd233 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 5 Feb 2025 06:59:25 +0100 Subject: calculate the positions for multiple selections at once --- init.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 99cb3cb..49e0253 100644 --- a/init.lua +++ b/init.lua @@ -177,13 +177,17 @@ local function vis_get_doc_pos(win) } end --- convert a lsp_range to a vis_range +--- Convert a lsp_range to a vis_range +-- @param file the file in which the range lies +-- @param lsp_range the LSP range that should be converted +-- @return the according vis range local function lsp_range_to_vis_range(file, lsp_range) local start = lsp_pos_to_vis_sel(lsp_range.start) - local start_pos = util.vis_sel_to_pos(file, start) - local finish = lsp_pos_to_vis_sel(lsp_range['end']) - local finish_pos = util.vis_sel_to_pos(file, finish) + + local positions = util.vis_sorted_selections_to_pos(file, {start, finish}) + local start_pos = positions[1] + local finish_pos = positions[2] return {start = start_pos, finish = finish_pos} end -- cgit v1.2.3 From fccd81d946b1bacc5c5075cafe37570f1e49ce2a Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Fri, 14 Feb 2025 16:23:19 +0100 Subject: improve the documentation of some lsp_type comparison helpers --- init.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'init.lua') diff --git a/init.lua b/init.lua index 49e0253..6d9568c 100644 --- a/init.lua +++ b/init.lua @@ -192,12 +192,19 @@ local function lsp_range_to_vis_range(file, lsp_range) return {start = start_pos, finish = finish_pos} end --- return true if p1 is before p2 +--- Check if a lsp_position lies before another. +-- @param p1 first lsp_position to compare +-- @param p2 second lsp_position to compare +-- @return true if p1 lies before p2 local function lsp_pos_before(p1, p2) return p1.line < p2.line or (p1.line == p2.line and p1.character < p2.character) end --- return true if r1 starts before r2 +--- Check if a lsp_range starts before another. +-- The ranges may overlap since only their start positions are compared. +-- @param r1 first lsp_range to compare +-- @param r2 second lsp_range to compare +-- @return true if r1 is starts before r2 local function lsp_range_starts_before(r1, r2) return lsp_pos_before(r1.start, r2.start) end -- cgit v1.2.3