fix: vim.treesitter.is_ancestor no longer returns true for identical nodes

Author: stevearc

lua/aerial/backends/treesitter/extensions.lua

@@ -18,7 +18,7 @@ local default_methods = {
   get_parent = function(stack, match, node)
     for i = #stack, 1, -1 do
       local last_node = stack[i].node
-      if vim.treesitter.is_ancestor(last_node, node) then
+      if last_node == node or vim.treesitter.is_ancestor(last_node, node) then
         return stack[i].item, last_node, i
       else
         table.remove(stack, i)

lua/aerial/backends/treesitter/init.lua

@@ -79,14 +79,17 @@ M.fetch_symbols_sync = function(bufnr)
     local name_match = match.name or {}
     local selection_match = match.selection or {}
     local symbol_node = (match.symbol or match.type or {}).node
+    if not symbol_node then
+      goto continue
+    end
     -- The location capture groups are optional. We default to the
     -- location of the @symbol capture
     local start_node = (match.start or {}).node or symbol_node
     local end_node = (match["end"] or {}).node or start_node
     local parent_item, parent_node, level = ext.get_parent(stack, match, symbol_node)
     -- Sometimes our queries will match the same node twice.
     -- Detect that (symbol_node == parent_node), and skip dupes.
-    if not symbol_node or symbol_node == parent_node then
+    if symbol_node == parent_node then
       goto continue
     end
     local kind = match.kind

tests/treesitter_spec.lua

@@ -27,11 +27,13 @@ describe("treesitter", function()
     local filepath = "./tests/treesitter/" .. filename
     local basename = vim.fn.fnamemodify(filename, ":r")
     local symbols_file = "./tests/symbols/" .. basename .. ".json"
-    it(filename, function()
-      util.test_file_symbols("treesitter", filepath, symbols_file)
-    end)
+    if not vim.env.TS_TEST or vim.env.TS_TEST == basename then
+      it(filename, function()
+        util.test_file_symbols("treesitter", filepath, symbols_file)
+      end)
+    end
 
-    if filename == "markdown_test.md" then
+    if filename == "markdown_test.md" and not vim.env.TS_TEST then
       it("<markdown backend> " .. filename, function()
         util.test_file_symbols("markdown", filepath, "./tests/symbols/markdown_backend.json")
       end)