barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 13

fix(conflict): clear stale diagnostics before re-enabling

Browse source 
Problem: after resolving all conflicts, vim.diagnostic.enable(true)
restored diagnostics that were cached while markers were present,
showing errors like "unexpected token end" on clean code.

Solution: call vim.diagnostic.reset() before re-enabling to flush
stale results and let the LSP re-analyze the resolved buffer.
This commit is contained in:
Barrett Ruth 2026-02-07 19:47:32 -05:00
parent 35cb13419c
commit a192830d8c
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/diffs/conflict.lua
View file

@ -216,6 +216,7 @@ local function refresh(bufnr, config)
if #regions == 0 then
vim.api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
if diagnostics_suppressed[bufnr] then
pcall(vim.diagnostic.reset, nil, bufnr)
pcall(vim.diagnostic.enable, true, { bufnr = bufnr })
diagnostics_suppressed[bufnr] = nil
end
@ -385,6 +386,7 @@ function M.detach(bufnr)
attached_buffers[bufnr] = nil
if diagnostics_suppressed[bufnr] then
pcall(vim.diagnostic.reset, nil, bufnr)
pcall(vim.diagnostic.enable, true, { bufnr = bufnr })
diagnostics_suppressed[bufnr] = nil
end