Skip to content

fix-race #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xav-ie wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix-race #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb686bd
test: add case for invalid buffer in tracking causing E5108
xav-ie Jan 7, 2026
23250a3
fix: validate buffer before showing in window
xav-ie Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lua/tabscope/buffer-managers/tab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ local function new(tracked_buffers)
local show_another_buffer_for_window = function(tab, win)
local another_buffer_to_show = -1
for buffer, _ in pairs(m._buffers_by_tab[tab]) do
if buffer ~= id then
if buffer ~= id and vim.api.nvim_buf_is_valid(buffer) then
another_buffer_to_show = buffer
break
end
Expand Down
4 changes: 4 additions & 0 deletions tests/main.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,7 @@ EOF
@test "remove local tab buffer that was last for tab" {
run_case
}

@test "remove tab buffer when tracked buffer was deleted externally" {
run_case
}
32 changes: 32 additions & 0 deletions tests/test-cases.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,36 @@ M.remove_local_tab_buffer_that_was_last_for_tab = function()
helpers.assert_listed_buffers({ "first", "second" })
end

M.remove_tab_buffer_when_tracked_buffer_was_deleted_externally = function()
local tabscope = require("tabscope")
tabscope.setup()

-- Create buffers and visit them
local buf1 = vim.api.nvim_create_buf(true, false)
local buf2 = vim.api.nvim_create_buf(true, false)
vim.api.nvim_buf_set_name(buf1, "first")
vim.api.nvim_buf_set_name(buf2, "second")
vim.api.nvim_set_current_buf(buf1)
vim.api.nvim_set_current_buf(buf2)

-- Wipe buf1
vim.cmd("bwipeout! " .. buf1)
assert(not vim.api.nvim_buf_is_valid(buf1), "buf1 should be invalid after wipeout")

-- Simulate race condition: tracking contains ONLY buf2 and the invalid buf1
-- Use table replacement to ensure exact state, with invalid buffer ID first
local current_tab = vim.api.nvim_get_current_tabpage()
tabscope.tab_buffers._buffers_by_tab[current_tab] = {}
tabscope.tab_buffers._buffers_by_tab[current_tab][buf1] = true -- invalid, added first
tabscope.tab_buffers._buffers_by_tab[current_tab][buf2] = true -- valid, current

-- Close buf2 - tabscope must try to show buf1 (the only other tracked buffer)
-- Without the fix: "Invalid buffer id: X"
tabscope.remove_tab_buffer()

-- Should succeed without error
local listed = helpers.get_listed_buffers()
assert(#listed >= 1, "should have at least one buffer")
end

return M