From dd0658f0c246492f515cd9e1e30615103d17d3c3 Mon Sep 17 00:00:00 2001 From: Yuan Fu Date: Fri, 29 Nov 2024 16:33:28 -0800 Subject: [PATCH] Allow passing nil to treesit-node-match-p (bug#74612) * src/treesit.c (Ftreesit_node_match_p): Return nil if NODE is nil. (cherry picked from commit 3c7687c1dd136fa535e22262f78fdfadbbf73105) --- src/treesit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/treesit.c b/src/treesit.c index 5e1e9b01059..2372944e166 100644 --- a/src/treesit.c +++ b/src/treesit.c @@ -4148,7 +4148,8 @@ PREDICATE can be a symbol representing a thing in `treesit-thing-settings', or a predicate, like regexp matching node type, etc. See `treesit-thing-settings' for more details. -Return non-nil if NODE matches PREDICATE, nil otherwise. +Return non-nil if NODE matches PREDICATE, nil otherwise. If NODE is +nil, return nil. Signals `treesit-invalid-predicate' if there's no definition of THING in `treesit-thing-settings', or if PREDICATE is malformed. If @@ -4156,6 +4157,8 @@ IGNORE-MISSING is non-nil, don't signal an error for missing THING definition, but still signal for malformed PREDICATE. */) (Lisp_Object node, Lisp_Object predicate, Lisp_Object ignore_missing) { + if (NILP (node)) return Qnil; + CHECK_TS_NODE (node); Lisp_Object parser = XTS_NODE (node)->parser; -- 2.39.5