From 773187235f77799c9bfd329b517cbf7b4f3fb0c3 Mon Sep 17 00:00:00 2001 From: Jon Smithers Date: Thu, 19 Nov 2026 09:14:57 -0500 Subject: [PATCH 1/2] fix: defer render when buffer numbers aren't assigned yet --- lua/codediff/ui/view/side_by_side/update.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lua/codediff/ui/view/side_by_side/update.lua b/lua/codediff/ui/view/side_by_side/update.lua index eaaad89d..68aa9e0c 100644 --- a/lua/codediff/ui/view/side_by_side/update.lua +++ b/lua/codediff/ui/view/side_by_side/update.lua @@ -197,7 +197,8 @@ function M.update(tabpage, session_config, auto_scroll_to_first_hunk) modified = modified_is_virtual and modified_info.needs_edit, } - local render_everything = function() + local render_everything + render_everything = function() if not current() then return end @@ -206,6 +207,13 @@ function M.update(tabpage, session_config, auto_scroll_to_first_hunk) return end + -- Guard: a reentrant vim.wait() (e.g. from a BufEnter autocmd fired by + -- open_real_file) can run this before reload_side has assigned bufnr. + if not original_info.bufnr or not modified_info.bufnr then + vim.schedule(render_everything) + return + end + -- Guard: Check if buffers are still valid if not vim.api.nvim_buf_is_valid(original_info.bufnr) or not vim.api.nvim_buf_is_valid(modified_info.bufnr) then return From d01ae24d8e1c2972a13e8c93a15d80949197ebe1 Mon Sep 17 00:00:00 2001 From: Jon Smithers Date: Thu, 19 Nov 2026 09:23:47 -0500 Subject: [PATCH 2/2] fix: retry deferred render on a timer instead of vim.schedule vim.wait() drains scheduled callbacks, so re-queueing with vim.schedule from inside the wait that blocks bufnr assignment spun forever. --- lua/codediff/ui/view/side_by_side/update.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/codediff/ui/view/side_by_side/update.lua b/lua/codediff/ui/view/side_by_side/update.lua index 68aa9e0c..cdeb7e62 100644 --- a/lua/codediff/ui/view/side_by_side/update.lua +++ b/lua/codediff/ui/view/side_by_side/update.lua @@ -210,7 +210,9 @@ function M.update(tabpage, session_config, auto_scroll_to_first_hunk) -- Guard: a reentrant vim.wait() (e.g. from a BufEnter autocmd fired by -- open_real_file) can run this before reload_side has assigned bufnr. if not original_info.bufnr or not modified_info.bufnr then - vim.schedule(render_everything) + -- A timer, not vim.schedule: vim.wait() drains scheduled callbacks, so + -- re-queueing here would spin inside the very wait that blocks us. + vim.defer_fn(render_everything, 10) return end