fix(treesitter): find buffer in multiple windows #28922

Problem:
1. When interacting with multiple :InspectTree and the source buffer
   windows there is a high chance of errors due to the window ids not
   being updated and validated.
2. Not all InspectTree windows were closed when the source buffer was
   closed.

Solution:
1. Update InspectTree window id on `CursorMoved` event and validate
   source buffer window id before trying to navigate to it.
2. Close all InspectTree windows
This commit is contained in:
Guilherme Soares
2024-05-27 13:20:03 +02:00
committed by GitHub
parent 104800ce2e
commit c4eb0b64bd
2 changed files with 74 additions and 1 deletions

View File

@@ -114,4 +114,57 @@ describe('vim.treesitter.inspect_tree', function()
(fenced_code_block_delimiter)))) ; [2, 0] - [2, 3] markdown
]]
end)
it('updates source and tree buffer windows and closes them correctly', function()
insert([[
print()
]])
-- setup two windows for the source buffer
exec_lua([[
source_win = vim.api.nvim_get_current_win()
vim.api.nvim_open_win(0, false, {
win = 0,
split = 'left'
})
]])
-- setup three windows for the tree buffer
exec_lua([[
vim.treesitter.start(0, 'lua')
vim.treesitter.inspect_tree()
tree_win = vim.api.nvim_get_current_win()
tree_win_copy_1 = vim.api.nvim_open_win(0, false, {
win = 0,
split = 'left'
})
tree_win_copy_2 = vim.api.nvim_open_win(0, false, {
win = 0,
split = 'left'
})
]])
-- close original source window
exec_lua('vim.api.nvim_win_close(source_win, false)')
-- navigates correctly to the remaining source buffer window
feed('<CR>')
eq('', n.api.nvim_get_vvar('errmsg'))
-- close original tree window
exec_lua([[
vim.api.nvim_set_current_win(tree_win_copy_1)
vim.api.nvim_win_close(tree_win, false)
]])
-- navigates correctly to the remaining source buffer window
feed('<CR>')
eq('', n.api.nvim_get_vvar('errmsg'))
-- close source buffer window and all remaining tree windows
t.pcall_err(exec_lua, 'vim.api.nvim_win_close(0, false)')
eq(false, exec_lua('return vim.api.nvim_win_is_valid(tree_win_copy_1)'))
eq(false, exec_lua('return vim.api.nvim_win_is_valid(tree_win_copy_2)'))
end)
end)