mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(diagnostics): cache line diagnostics when current_line is set #32288

Browse Source 
Compute the diagnostics per line when `show` is called, allowing for
O(1) access for the diagnostics to display when the cursor line or the
list of diagnostics haven't changed.
This commit is contained in:
Maria José Solano
2025-02-02 03:40:43 -08:00
committed by GitHub
parent e08e3d15f6
commit 48e3ac60c6
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
runtime/lua/vim/diagnostic.lua
View File

@@ -1805,20 +1805,26 @@ local function render_virtual_lines(namespace, bufnr, diagnostics)
end end
end end
--- @param diagnostics vim.Diagnostic[] --- @param diagnostics table<integer, vim.Diagnostic[]>
--- @param namespace integer --- @param namespace integer
--- @param bufnr integer --- @param bufnr integer
local function render_virtual_lines_at_current_line(diagnostics, namespace, bufnr) local function render_virtual_lines_at_current_line(diagnostics, namespace, bufnr)
local line_diagnostics = {}
local lnum = api.nvim_win_get_cursor(0)[1] - 1 local lnum = api.nvim_win_get_cursor(0)[1] - 1
local cursor_diagnostics = {}
for _, diag in ipairs(diagnostics) do if diagnostics[lnum] ~= nil then
if (lnum == diag.lnum) or (diag.end_lnum and lnum >= diag.lnum and lnum <= diag.end_lnum) then cursor_diagnostics = diagnostics[lnum]
table.insert(line_diagnostics, diag) else
for _, line_diags in pairs(diagnostics) do
for _, diag in ipairs(line_diags) do
if diag.end_lnum and lnum >= diag.lnum and lnum <= diag.end_lnum then
table.insert(cursor_diagnostics, diag)
end
end
end end
end end
render_virtual_lines(namespace, bufnr, line_diagnostics) render_virtual_lines(namespace, bufnr, cursor_diagnostics)
end end
M.handlers.virtual_lines = { M.handlers.virtual_lines = {
@@ -1854,15 +1860,18 @@ M.handlers.virtual_lines = {
end end
if opts.virtual_lines.current_line == true then if opts.virtual_lines.current_line == true then
-- Create a mapping from line -> diagnostics so that we can quickly get the
-- diagnostics we need when the cursor line doesn't change.
local line_diagnostics = diagnostic_lines(diagnostics)
api.nvim_create_autocmd('CursorMoved', { api.nvim_create_autocmd('CursorMoved', {
buffer = bufnr, buffer = bufnr,
group = ns.user_data.virt_lines_augroup, group = ns.user_data.virt_lines_augroup,
callback = function() callback = function()
render_virtual_lines_at_current_line(diagnostics, ns.user_data.virt_lines_ns, bufnr) render_virtual_lines_at_current_line(line_diagnostics, ns.user_data.virt_lines_ns, bufnr)
end, end,
}) })
-- Also show diagnostics for the current line before the first CursorMoved event. -- Also show diagnostics for the current line before the first CursorMoved event.
render_virtual_lines_at_current_line(diagnostics, ns.user_data.virt_lines_ns, bufnr) render_virtual_lines_at_current_line(line_diagnostics, ns.user_data.virt_lines_ns, bufnr)
else else
render_virtual_lines(ns.user_data.virt_lines_ns, bufnr, diagnostics) render_virtual_lines(ns.user_data.virt_lines_ns, bufnr, diagnostics)
end end