PR feedback addressed on multi tag predicate scenario

tweag · Jan 14, 2025 · 3aaacbf · 3aaacbf
1 parent 30bd543
commit 3aaacbf
Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/topiary-cli/tests/samples/expected/tree_sitter_query.scm b/topiary-cli/tests/samples/expected/tree_sitter_query.scm
@@ -1513,7 +1513,7 @@
 ; Predicate parameter newline separatation and indentation
 ; ================================================================================
 
-(#any-of? @function.builtin
+(#any-of? @function.builtin @foo
   "union"
   "difference"
   "intersection"

diff --git a/topiary-cli/tests/samples/input/tree_sitter_query.scm b/topiary-cli/tests/samples/input/tree_sitter_query.scm
@@ -1514,9 +1514,9 @@
 ; Predicate parameter newline separatation and indentation
 ; ================================================================================
 
-(#any-of? @function.builtin "union" "difference" "intersection"
+(#any-of? @function.builtin @foo "union" "difference" "intersection"
 "circle")
 
 (#set! 
-injection.language 
+injection.language
 "doxygen")
diff --git a/topiary-queries/queries/tree_sitter_query.scm b/topiary-queries/queries/tree_sitter_query.scm
@@ -55,11 +55,21 @@
 ; Add softlines and indentation after parameter capture groups and identifiers.
 (predicate
   (parameters
-    [(identifier) (capture)]+ @append_spaced_softline @append_indent_start
-    (_)* @append_spaced_softline
-    .
-    (_) @append_indent_end @append_empty_softline
+    [(identifier) (capture)] @append_spaced_softline @append_indent_start
     .
+    (string)
+  ) @append_indent_end
+)
+
+(predicate
+  (parameters
+    (string) @append_empty_softline
+  )
+)
+
+(predicate
+  (parameters
+    (_) @prepend_space
   )
 )
 (predicate