Fix treesit-search-forward not matching leaf nodes

* src/treesit.c: Match against NODE at start of the loop.

diff --git a/src/treesit.c b/src/treesit.c
index 1e1238eefd378327efbf8b8e04970cb5c7a17548..a05efaf5db5561c7db40d7aeba7cba8041db0db4 100644 (file)
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2654,8 +2654,17 @@ treesit_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
 
      (while node (setq node (treesit-search-forward node)))
   */
+  bool initial = true;
   while (true)
     {
+      if (!initial /* We don't match START.  */
+         && treesit_traverse_match_predicate (node, pred, parser))
+       {
+         *start = node;
+         return true;
+       }
+      initial = false;
+
       TSNode next = treesit_traverse_sibling_helper (node, forward, named);
       while (ts_node_is_null (next))
        {