fix(nightly): Fix compatibility with Neovim nightly

Author: kristijanhusak

lua/orgmode/config/init.lua

@@ -377,7 +377,7 @@ function Config:setup_ts_predicates()
     end
 
     return false
-  end, { force = true })
+  end, { force = true, all = false })
 
   vim.treesitter.query.add_predicate('org-is-valid-priority?', function(match, _, source, predicate)
     local node = match[predicate[2]]
@@ -412,7 +412,7 @@ function Config:setup_ts_predicates()
     local todo_text = vim.treesitter.get_node_text(prev_sibling, source)
     local is_prev_sibling_todo_keyword = todo_keywords[todo_text] and true or false
     return is_prev_sibling_todo_keyword
-  end, { force = true })
+  end, { force = true, all = false })
 
   vim.treesitter.query.add_directive('org-set-block-language!', function(match, _, bufnr, pred, metadata)
     local lang_node = match[pred[2]]
@@ -424,7 +424,7 @@ function Config:setup_ts_predicates()
       return
     end
     metadata['injection.language'] = utils.detect_filetype(text, true)
-  end, { force = true })
+  end, { force = true, all = false })
 
   vim.treesitter.query.add_predicate('org-is-headline-level?', function(match, _, _, predicate)
     ---@type TSNode
@@ -435,7 +435,7 @@ function Config:setup_ts_predicates()
     end
     local _, _, _, node_end_col = node:range()
     return ((node_end_col - 1) % 8) + 1 == level
-  end, { force = true })
+  end, { force = true, all = false })
 end
 
 ---@param content table

lua/orgmode/files/file.lua

@@ -172,10 +172,14 @@ function OrgFile:get_ts_matches(query, node)
   local matches = {}
 
   local from, _, to = node:range()
-  for _, match, _ in ts_query:iter_matches(node, self:_get_source(), from, to + 1) do
+  for _, match, _ in ts_query:iter_matches(node, self:_get_source(), from, to + 1, { all = false }) do
     local items = {}
-    for id, matched_node in pairs(match) do
+    for id, matched_nodes in pairs(match) do
       local name = ts_query.captures[id]
+      local matched_node = matched_nodes
+      if type(matched_nodes) == 'table' then
+        matched_node = matched_nodes[#matched_nodes]
+      end
       local node_text = self:get_node_text_list(matched_node)
       items[name] = {
         node = matched_node,