2 files changed, 16 insertions, 8 deletions
diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 7b522ca92b..d68a30cc11 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -527,7 +527,7 @@ function M.inspect_tree(opts)
     end,
   })
 
-  api.nvim_create_autocmd('BufHidden', {
+  api.nvim_create_autocmd({ 'BufHidden', 'BufUnload' }, {
     group = group,
     buffer = buf,
     once = true,
@@ -665,10 +665,10 @@ function M.edit_query(lang)
       api.nvim_buf_clear_namespace(query_buf, edit_ns, 0, -1)
     end,
   })
-  api.nvim_create_autocmd('BufHidden', {
+  api.nvim_create_autocmd({ 'BufHidden', 'BufUnload' }, {
     group = group,
     buffer = buf,
-    desc = 'Close the editor window when the source buffer is hidden',
+    desc = 'Close the editor window when the source buffer is hidden or unloaded',
     once = true,
     callback = function()
       close_win(query_win)
diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index 637f9ea543..53b64d1dec 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -4,10 +4,21 @@ local health = vim.health
 
 --- Performs a healthcheck for treesitter integration
 function M.check()
-  local parsers = vim.api.nvim_get_runtime_file('parser/*', true)
+  health.start('Treesitter features')
+
+  health.info(
+    string.format(
+      'Treesitter ABI support: min %d, max %d',
+      vim.treesitter.minimum_language_version,
+      ts.language_version
+    )
+  )
 
-  health.info(string.format('Nvim runtime ABI version: %d', ts.language_version))
+  local can_wasm = vim._ts_add_language_from_wasm ~= nil
+  health.info(string.format('WASM parser support: %s', tostring(can_wasm)))
 
+  health.start('Treesitter parsers')
+  local parsers = vim.api.nvim_get_runtime_file('parser/*', true)
   for _, parser in pairs(parsers) do
     local parsername = vim.fn.fnamemodify(parser, ':t:r')
     local is_loadable, err_or_nil = pcall(ts.language.add, parsername)
@@ -28,9 +39,6 @@ function M.check()
       )
     end
   end
-
-  local can_wasm = vim._ts_add_language_from_wasm ~= nil
-  health.info(string.format('Can load WASM parsers: %s', tostring(can_wasm)))
 end
 
 return M