bug#44418: 28.0.50; Spliced variable not matched as symbol in isearch

["Mattias Engdegård" <mattias.engdegard@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

> Maybe we can introduce (@ NAME) as alternative syntax?

Here is a proof-of-concept (missing tests and documentation), but it works and I think it's a definite improvement.

Maybe we can get a blessing from Yuan Fu. To recap, this permits the syntax (@ symbol-name) as an alternative to @symbol-name in treesit queries because that allows symbol searching to match the symbol-name, and this can be really helpful.


[-- Attachment #2: treesit-alt-capture-construct.diff --]
[-- Type: application/octet-stream, Size: 1824 bytes --]

diff --git a/src/treesit.c b/src/treesit.c
index 87aa1eeb377..64570094347 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2358,6 +2358,7 @@ DEFUN ("treesit-pattern-expand",
     (TYPE PATTERN...)
     [PATTERN...]
     FIELD-NAME:
+    (@ CAPTURE-NAME)
     @CAPTURE-NAME
     (_)
     _
@@ -2380,18 +2381,27 @@ DEFUN ("treesit-pattern-expand",
     return Vtreesit_str_pound_match;
   if (BASE_EQ (pattern, QCpred))
     return Vtreesit_str_pound_pred;
-  Lisp_Object opening_delimeter
-    = VECTORP (pattern)
-      ? Vtreesit_str_open_bracket : Vtreesit_str_open_paren;
-  Lisp_Object closing_delimiter
-    = VECTORP (pattern)
-      ? Vtreesit_str_close_bracket : Vtreesit_str_close_paren;
+
+  /* (@ X) -> @Y where X -> Y */
+  if (CONSP (pattern) && BASE_EQ (XCAR (pattern), Qat)
+      && CONSP (XCDR (pattern)) && NILP (XCDR (XCDR (pattern))))
+    return concat2 (build_string ("@"),
+		    Ftreesit_pattern_expand (XCAR (XCDR (pattern))));
+
   if (VECTORP (pattern) || CONSP (pattern))
+    {
+      Lisp_Object opening_delimeter
+	= VECTORP (pattern)
+	? Vtreesit_str_open_bracket : Vtreesit_str_open_paren;
+      Lisp_Object closing_delimiter
+	= VECTORP (pattern)
+	? Vtreesit_str_close_bracket : Vtreesit_str_close_paren;
     return concat3 (opening_delimeter,
 		    Fmapconcat (Qtreesit_pattern_expand,
 				pattern,
 				Vtreesit_str_space),
 		    closing_delimiter);
+    }
   if (STRINGP (pattern))
     return treesit_query_string_string (pattern);
 
@@ -2414,6 +2424,7 @@ DEFUN ("treesit-query-expand",
     (TYPE PATTERN...)
     [PATTERN...]
     FIELD-NAME:
+    (@ CAPTURE-NAME)
     @CAPTURE-NAME
     (_)
     _
@@ -4101,4 +4112,6 @@ syms_of_treesit (void)
   defsubr (&Streesit_subtree_stat);
 #endif /* HAVE_TREE_SITTER */
   defsubr (&Streesit_available_p);
+
+  DEFSYM (Qat, "@");
 }

[-- Attachment #3: Type: text/plain, Size: 2 bytes --]