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

fix(diagnostic): use nvim_exec_autocmds to trigger DiagnosticChanged (#18188)

Browse Source 
Use nvim_exec_autocmds to issue the DiagnosticChanged autocommand,
rather than nvim_buf_call, which has some side effects when drawing
statuslines.
This commit is contained in:
Gregory Anders 2022-04-20 08:16:47 -06:00 committed by GitHub
parent 81f1e33d15
commit 6b0d3ae6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,14 +668,10 @@ function M.set(namespace, bufnr, diagnostics, opts)
M.show(namespace, bufnr, nil, opts) M.show(namespace, bufnr, nil, opts)
end end
vim.api.nvim_buf_call(bufnr, function() vim.api.nvim_exec_autocmds("DiagnosticChanged", {
vim.api.nvim_command( modeline = false,
string.format( buffer = bufnr,
"doautocmd <nomodeline> DiagnosticChanged %s", })
vim.fn.fnameescape(vim.api.nvim_buf_get_name(bufnr))
)
)
end)
end end
--- Get namespace metadata. --- Get namespace metadata.
@ -1382,14 +1378,10 @@ function M.reset(namespace, bufnr)
M.hide(iter_namespace, iter_bufnr) M.hide(iter_namespace, iter_bufnr)
end end
vim.api.nvim_buf_call(iter_bufnr, function() vim.api.nvim_exec_autocmds("DiagnosticChanged", {
vim.api.nvim_command( modeline = false,
string.format( buffer = iter_bufnr,
"doautocmd <nomodeline> DiagnosticChanged %s", })
vim.fn.fnameescape(vim.api.nvim_buf_get_name(iter_bufnr))
)
)
end)
end end
end end

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

@ -1939,24 +1939,31 @@ describe('vim.diagnostic', function()
end) end)
it('triggers the autocommand when diagnostics are set', function() it('triggers the autocommand when diagnostics are set', function()
eq(1, exec_lua [[ eq(true, exec_lua [[
-- Set a different buffer as current to test that <abuf> is being set properly in
-- DiagnosticChanged callbacks
local tmp = vim.api.nvim_create_buf(false, true)
vim.api.nvim_set_current_buf(tmp)
vim.g.diagnostic_autocmd_triggered = 0 vim.g.diagnostic_autocmd_triggered = 0
vim.cmd('autocmd DiagnosticChanged * let g:diagnostic_autocmd_triggered = 1') vim.cmd('autocmd DiagnosticChanged * let g:diagnostic_autocmd_triggered = +expand("<abuf>")')
vim.api.nvim_buf_set_name(diagnostic_bufnr, "test | test") vim.api.nvim_buf_set_name(diagnostic_bufnr, "test | test")
vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, { vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, {
make_error('Diagnostic', 0, 0, 0, 0) make_error('Diagnostic', 0, 0, 0, 0)
}) })
return vim.g.diagnostic_autocmd_triggered return vim.g.diagnostic_autocmd_triggered == diagnostic_bufnr
]]) ]])
end) end)
it('triggers the autocommand when diagnostics are cleared', function() it('triggers the autocommand when diagnostics are cleared', function()
eq(1, exec_lua [[ eq(true, exec_lua [[
local tmp = vim.api.nvim_create_buf(false, true)
vim.api.nvim_set_current_buf(tmp)
vim.g.diagnostic_autocmd_triggered = 0 vim.g.diagnostic_autocmd_triggered = 0
vim.cmd('autocmd DiagnosticChanged * let g:diagnostic_autocmd_triggered = 1') vim.cmd('autocmd DiagnosticChanged * let g:diagnostic_autocmd_triggered = +expand("<abuf>")')
vim.api.nvim_buf_set_name(diagnostic_bufnr, "test | test") vim.api.nvim_buf_set_name(diagnostic_bufnr, "test | test")
vim.diagnostic.reset(diagnostic_ns, diagnostic_bufnr) vim.diagnostic.reset(diagnostic_ns, diagnostic_bufnr)
return vim.g.diagnostic_autocmd_triggered return vim.g.diagnostic_autocmd_triggered == diagnostic_bufnr
]]) ]])
end) end)
end) end)