test(treesitter): inspect_tree #31182

To prevent #30986 and #31198 regression update inspect_tree tests

1 files changed, 18 insertions, 11 deletions

diff --git a/test/functional/treesitter/inspect_tree_spec.lua b/test/functional/treesitter/inspect_tree_spec.lua
index 1f7d15cc96..47f3421cfe 100644
--- a/test/functional/treesitter/inspect_tree_spec.lua
+++ b/test/functional/treesitter/inspect_tree_spec.lua
@@ -120,14 +120,17 @@ describe('vim.treesitter.inspect_tree', function()
   end)
 
   it('updates source and tree buffer windows and closes them correctly', function()
+    local name = t.tmpname()
+    n.command('edit ' .. name)
     insert([[
       print()
       ]])
+    n.command('set filetype=lua | write')
 
     -- setup two windows for the source buffer
     exec_lua(function()
       _G.source_win = vim.api.nvim_get_current_win()
-      vim.api.nvim_open_win(0, false, {
+      _G.source_win2 = vim.api.nvim_open_win(0, false, {
         win = 0,
         split = 'left',
       })
@@ -135,40 +138,44 @@ describe('vim.treesitter.inspect_tree', function()
 
     -- setup three windows for the tree buffer
     exec_lua(function()
-      vim.treesitter.start(0, 'lua')
       vim.treesitter.inspect_tree()
       _G.tree_win = vim.api.nvim_get_current_win()
-      _G.tree_win_copy_1 = vim.api.nvim_open_win(0, false, {
+      _G.tree_win2 = vim.api.nvim_open_win(0, false, {
         win = 0,
         split = 'left',
       })
-      _G.tree_win_copy_2 = vim.api.nvim_open_win(0, false, {
+      _G.tree_win3 = vim.api.nvim_open_win(0, false, {
         win = 0,
         split = 'left',
       })
     end)
 
-    -- close original source window
-    exec_lua('vim.api.nvim_win_close(source_win, false)')
+    -- close original source window without closing tree views
+    exec_lua('vim.api.nvim_set_current_win(source_win)')
+    feed(':quit<CR>')
+    eq('', n.api.nvim_get_vvar('errmsg'))
+    eq(true, exec_lua('return vim.api.nvim_win_is_valid(tree_win)'))
+    eq(true, exec_lua('return vim.api.nvim_win_is_valid(tree_win2)'))
+    eq(true, exec_lua('return vim.api.nvim_win_is_valid(tree_win3)'))
 
     -- navigates correctly to the remaining source buffer window
+    exec_lua('vim.api.nvim_set_current_win(tree_win)')
     feed('<CR>')
     eq('', n.api.nvim_get_vvar('errmsg'))
+    eq(true, exec_lua('return vim.api.nvim_get_current_win() == source_win2'))
 
     -- close original tree window
     exec_lua(function()
-      vim.api.nvim_set_current_win(_G.tree_win_copy_1)
+      vim.api.nvim_set_current_win(_G.tree_win2)
       vim.api.nvim_win_close(_G.tree_win, false)
     end)
 
     -- navigates correctly to the remaining source buffer window
     feed('<CR>')
     eq('', n.api.nvim_get_vvar('errmsg'))
+    eq(true, exec_lua('return vim.api.nvim_get_current_win() == source_win2'))
 
     -- 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)'))
+    n.expect_exit(n.command, 'quit')
   end)
 end)