3 files changed, 37 insertions, 15 deletions
diff --git a/runtime/lua/vim/highlight.lua b/runtime/lua/vim/highlight.lua
index ce0a3de520..705b34dc99 100644
--- a/runtime/lua/vim/highlight.lua
+++ b/runtime/lua/vim/highlight.lua
@@ -14,7 +14,7 @@ function highlight.range(bufnr, ns, higroup, start, finish, rtype, inclusive)
   inclusive = inclusive or false
 
   -- sanity check
-  if start[2] < 0 or finish[2] < start[2] then return end
+  if start[2] < 0 or finish[1] < start[1] then return end
 
   local region = vim.region(bufnr, start, finish, rtype, inclusive)
   for linenr, cols in pairs(region) do
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index bb78b5654c..1acf888821 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -98,7 +98,8 @@ function TSHighlighter:get_hl_from_capture(capture)
     return vim.split(name, '.', true)[1]
   else
     -- Default to false to avoid recomputing
-    return a.nvim_get_hl_id_by_name(TSHighlighter.hl_map[name])
+    local hl = TSHighlighter.hl_map[name]
+    return hl and a.nvim_get_hl_id_by_name(hl) or 0
   end
 end
 
diff --git a/runtime/lua/vim/treesitter/query.lua b/runtime/lua/vim/treesitter/query.lua
index 803b9edbf0..ca27a50c6a 100644
--- a/runtime/lua/vim/treesitter/query.lua
+++ b/runtime/lua/vim/treesitter/query.lua
@@ -60,7 +60,7 @@ local predicate_handlers = {
       return true
   end,
 
-  ["match?"] = function(match, _, bufnr, predicate)
+  ["lua-match?"] = function(match, _, bufnr, predicate)
       local node = match[predicate[2]]
       local regex = predicate[3]
       local start_row, _, end_row, _ = node:range()
@@ -71,7 +71,7 @@ local predicate_handlers = {
       return string.find(M.get_node_text(node, bufnr), regex)
   end,
 
-  ["vim-match?"] = (function()
+  ["match?"] = (function()
     local magic_prefixes = {['\\v']=true, ['\\m']=true, ['\\M']=true, ['\\V']=true}
     local function check_magic(str)
       if string.len(str) < 2 or magic_prefixes[string.sub(str,1,2)] then
@@ -114,6 +114,9 @@ local predicate_handlers = {
   end
 }
 
+-- As we provide lua-match? also expose vim-match?
+predicate_handlers["vim-match?"] = predicate_handlers["match?"]
+
 --- Adds a new predicates to be used in queries
 --
 -- @param name the name of the predicate, without leading #
@@ -127,25 +130,43 @@ function M.add_predicate(name, handler, force)
   predicate_handlers[name] = handler
 end
 
+--- Returns the list of currently supported predicates
+function M.list_predicates()
+  return vim.tbl_keys(predicate_handlers)
+end
+
+local function xor(x, y)
+  return (x or y) and not (x and y)
+end
+
 function Query:match_preds(match, pattern, bufnr)
   local preds = self.info.patterns[pattern]
-  if not preds then
-    return true
-  end
-  for _, pred in pairs(preds) do
+
+  for _, pred in pairs(preds or {}) do
     -- Here we only want to return if a predicate DOES NOT match, and
     -- continue on the other case. This way unknown predicates will not be considered,
     -- which allows some testing and easier user extensibility (#12173).
     -- Also, tree-sitter strips the leading # from predicates for us.
+    local pred_name
+    local is_not
     if string.sub(pred[1], 1, 4) == "not-" then
-      local pred_name = string.sub(pred[1], 5)
-      if predicate_handlers[pred_name] and
-        predicate_handlers[pred_name](match, pattern, bufnr, pred) then
-        return false
-      end
+      pred_name = string.sub(pred[1], 5)
+      is_not = true
+    else
+      pred_name = pred[1]
+      is_not = false
+    end
+
+    local handler = predicate_handlers[pred_name]
+
+    if not handler then
+      a.nvim_err_writeln(string.format("No handler for %s", pred[1]))
+      return false
+    end
+
+    local pred_matches = handler(match, pattern, bufnr, pred)
 
-    elseif predicate_handlers[pred[1]] and
-      not predicate_handlers[pred[1]](match, pattern, bufnr, pred) then
+    if not xor(is_not, pred_matches) then
       return false
     end
   end