mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(diagnostic): clear stale cache on reset (#21454)

Browse Source 
The BufWipeout autocmd is not 100% reliable and may leave stale entries
in the cache. This is sort of a hack/workaround to ensure
`vim.diagnostic.reset` calls don't fail if there are stale cache entries
but instead clears them

Fixes errors like

    Error executing vim.schedule lua callback: /usr/share/nvim/runtime/lua/vim/diagnostic.lua:1458: Invalid buffer id: 22
    stack traceback:
            [C]: in function 'nvim_exec_autocmds'
            /usr/share/nvim/runtime/lua/vim/diagnostic.lua:1458: in function 'reset'
This commit is contained in:
Mathias Fußenegger
2022-12-18 03:19:15 +01:00
committed by GitHub
parent 1c4794944d
commit 1743359235
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -922,7 +922,7 @@ M.handlers.signs = {
end, end,
hide = function(namespace, bufnr) hide = function(namespace, bufnr)
local ns = M.get_namespace(namespace) local ns = M.get_namespace(namespace)
if ns.user_data.sign_group then if ns.user_data.sign_group and api.nvim_buf_is_valid(bufnr) then
vim.fn.sign_unplace(ns.user_data.sign_group, { buffer = bufnr }) vim.fn.sign_unplace(ns.user_data.sign_group, { buffer = bufnr })
end end
end, end,
@@ -977,7 +977,9 @@ M.handlers.underline = {
local ns = M.get_namespace(namespace) local ns = M.get_namespace(namespace)
if ns.user_data.underline_ns then if ns.user_data.underline_ns then
diagnostic_cache_extmarks[bufnr][ns.user_data.underline_ns] = {} diagnostic_cache_extmarks[bufnr][ns.user_data.underline_ns] = {}
api.nvim_buf_clear_namespace(bufnr, ns.user_data.underline_ns, 0, -1) if api.nvim_buf_is_valid(bufnr) then
api.nvim_buf_clear_namespace(bufnr, ns.user_data.underline_ns, 0, -1)
end
end end
end, end,
} }
@@ -1040,7 +1042,9 @@ M.handlers.virtual_text = {
local ns = M.get_namespace(namespace) local ns = M.get_namespace(namespace)
if ns.user_data.virt_text_ns then if ns.user_data.virt_text_ns then
diagnostic_cache_extmarks[bufnr][ns.user_data.virt_text_ns] = {} diagnostic_cache_extmarks[bufnr][ns.user_data.virt_text_ns] = {}
api.nvim_buf_clear_namespace(bufnr, ns.user_data.virt_text_ns, 0, -1) if api.nvim_buf_is_valid(bufnr) then
api.nvim_buf_clear_namespace(bufnr, ns.user_data.virt_text_ns, 0, -1)
end
end end
end, end,
} }
@@ -1470,11 +1474,15 @@ function M.reset(namespace, bufnr)
M.hide(iter_namespace, iter_bufnr) M.hide(iter_namespace, iter_bufnr)
end end
api.nvim_exec_autocmds('DiagnosticChanged', { if api.nvim_buf_is_valid(iter_bufnr) then
modeline = false, api.nvim_exec_autocmds('DiagnosticChanged', {
buffer = iter_bufnr, modeline = false,
data = { diagnostics = {} }, buffer = iter_bufnr,
}) data = { diagnostics = {} },
})
else
diagnostic_cache[iter_bufnr] = nil
end
end end
end end

18
test/functional/lua/diagnostic_spec.lua
View File

@@ -160,6 +160,24 @@ describe('vim.diagnostic', function()
]]) ]])
end) end)
it('removes diagnostic from stale cache on reset', function()
local diagnostics = exec_lua [[
vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
make_error('Diagnostic #1', 1, 1, 1, 1),
make_error('Diagnostic #2', 2, 1, 2, 1),
})
local other_bufnr = vim.fn.bufadd('test | test')
vim.cmd('noautocmd bwipeout! ' .. diagnostic_bufnr)
return vim.diagnostic.get(diagnostic_bufnr)
]]
eq(2, #diagnostics)
diagnostics = exec_lua [[
vim.diagnostic.reset()
return vim.diagnostic.get()
]]
eq(0, #diagnostics)
end)
it('resolves buffer number 0 to the current buffer', function() it('resolves buffer number 0 to the current buffer', function()
eq(2, exec_lua [[ eq(2, exec_lua [[
vim.api.nvim_set_current_buf(diagnostic_bufnr) vim.api.nvim_set_current_buf(diagnostic_bufnr)