talon

Author: AndreasArvidsson

data/fixtures/scopes/talon/argument.actual.iteration3.scope

@@ -0,0 +1,10 @@
+command: sleep(100ms)
+---
+
+[Range] = 0:15-0:20
+                 >-----<
+0| command: sleep(100ms)
+
+[Domain] = 0:9-0:21
+           >------------<
+0| command: sleep(100ms)

data/fixtures/scopes/talon/argument.actual3.scope

@@ -0,0 +1,10 @@
+command: sleep(100ms)
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:15-0:20
+                 >-----<
+0| command: sleep(100ms)
+
+[Insertion delimiter] = " "

queries/scm.scm

@@ -43,6 +43,8 @@
   )
 )
 
+;;!! (#aaa? @bbb "ccc")
+;;!         ^^^^^^^^^^
 (
   (predicate
     (parameters) @argumentList @argumentOrParameter.iteration

queries/talon.scm

@@ -157,20 +157,14 @@
 ;;!! key(enter)
 ;;!      ^^^^^
 (key_action
-  (implicit_string) @argumentOrParameter @argumentList
-) @argumentList.domain
-
-;;!! key(enter)
-;;!      ^^^^^
-(_
-  (implicit_string) @argumentOrParameter.iteration
-) @argumentOrParameter.iteration.domain
+  (implicit_string) @argumentOrParameter @argumentOrParameter.iteration @argumentList
+) @argumentOrParameter.iteration.domain @argumentList.domain
 
 ;;!! sleep(100ms)
 ;;!        ^^^^^
 (sleep_action
-  (implicit_string) @argumentOrParameter @argumentList
-) @argumentList.domain
+  (implicit_string) @argumentOrParameter @argumentOrParameter.iteration @argumentList
+) @argumentOrParameter.iteration.domain @argumentList.domain
 
 ;;!! print("hello", "world")
 ;;!        ^^^^^^^  ^^^^^^^
@@ -187,10 +181,11 @@
 
 (_
   (argument_list
-    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
-  ) @_dummy
-  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+    "(" @argumentList.removal.start.endOf @argumentOrParameter.iteration.start.endOf
+    ")" @argumentList.removal.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @argumentList
+  (#child-range! @argumentList 1 -2)
+  (#empty-single-multi-delimiter! @argumentList @argumentList "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
 ;;!! # foo