fix(buf_fix_win): prevent duplicate BufWinEnter autocmds for the same buffer

Author: sudo-tee

lua/opencode/ui/buf_fix_win.lua

@@ -15,16 +15,14 @@ local function close_duplicates(buf, get_win)
   end
 
   local wins = vim.fn.win_findbuf(buf)
-  if #wins <= 1 then
-    return
-  end
-
-  for _, win in ipairs(wins) do
-    if win ~= intended and vim.api.nvim_win_is_valid(win) then
-      vim.schedule(function()
-        pcall(vim.api.nvim_win_close, win, true)
-      end)
-    end
+  if #wins > 1 then
+    vim.schedule(function()
+      for _, win in ipairs(wins) do
+        if win ~= intended and vim.api.nvim_win_is_valid(win) then
+          pcall(vim.api.nvim_win_close, win, true)
+        end
+      end
+    end)
   end
 end
 

lua/opencode/ui/input_window.lua

@@ -65,7 +65,6 @@ function M.create_buf()
 
   local buffixwin = require('opencode.ui.buf_fix_win')
   buffixwin.fix_to_win(input_buf, function()
-    local state = require('opencode.state')
     return state.windows and state.windows.input_win
   end)
 

lua/opencode/ui/output_window.lua

@@ -11,7 +11,6 @@ function M.create_buf()
 
   local buffixwin = require('opencode.ui.buf_fix_win')
   buffixwin.fix_to_win(output_buf, function()
-    local state = require('opencode.state')
     return state.windows and state.windows.output_win
   end)
 

tests/unit/buf_fix_win_spec.lua

@@ -358,6 +358,25 @@ describe('buf_fix_win module', function()
       assert.equal(initial_buf2 + 1, final_buf2)
     end)
 
+    it('should not accumulate BufWinEnter autocmds when fix_to_win is called multiple times for same buffer', function()
+      local buf = create_test_buffer()
+      local win = create_test_window(buf)
+
+      local initial = #vim.api.nvim_get_autocmds({ event = 'BufWinEnter', buffer = buf })
+
+      fresh_buf_fix_win.fix_to_win(buf, function()
+        return win
+      end)
+      local after_first = #vim.api.nvim_get_autocmds({ event = 'BufWinEnter', buffer = buf })
+      fresh_buf_fix_win.fix_to_win(buf, function()
+        return win
+      end)
+      local after_second = #vim.api.nvim_get_autocmds({ event = 'BufWinEnter', buffer = buf })
+
+      assert.equal(initial + 1, after_first)
+      assert.equal(initial + 1, after_second)
+    end)
+
     it('should setup global VimResized autocmd when fix_to_win is first called', function()
       local buf = create_test_buffer()
       local win = create_test_window(buf)