Fix tests for trailing and leading delimiter for multiple arguments

Author: BlueDrink9

data/fixtures/scopes/r/argument.actual.scope

@@ -6,12 +6,12 @@ func(x, y)
        >-<
 0| func(x, y)
 
-[#1 Removal] = 0:5-0:7
-       >--<
+[#1 Removal] = 0:5-0:8
+       >---<
 0| func(x, y)
 
-[#1 Trailing delimiter] = 0:6-0:7
-        >-<
+[#1 Trailing delimiter] = 0:6-0:8
+        >--<
 0| func(x, y)
 
 [#1 Insertion delimiter] = ", "
@@ -22,12 +22,12 @@ func(x, y)
           >-<
 0| func(x, y)
 
-[#2 Removal] = 0:7-0:9
-         >--<
+[#2 Removal] = 0:6-0:9
+        >---<
 0| func(x, y)
 
-[#2 Leading delimiter] = 0:7-0:8
-         >-<
+[#2 Leading delimiter] = 0:6-0:8
+        >--<
 0| func(x, y)
 
 [#2 Insertion delimiter] = ", "

queries/r.scm

@@ -27,10 +27,6 @@
 ;;   alternative: (braced_expression)? @branch.end
 ;; ) @branch.iteration
 
-;;!! foo(x)
-;;!  ^^^^^^
-(call) @functionCall
-
 ;;!! function(x){ }
 ;;!  ^^^^^^^^^^^^^^
 (function_definition) @anonymousFunction
@@ -39,19 +35,20 @@
 ;;!      ^^^^^
 (_
   arguments: (arguments
-    (_)? @_.leading.endOf
-    .
-    (argument) @argumentOrParameter
-    .
-    (_)? @_.trailing.endOf
-  )
-  @_dummy
+    ;; (
+      (_)? @_.leading.endOf
+      .
+      (argument) @argumentOrParameter
+      .
+      (_)? @_.trailing.startOf
+    ;; ) @_.domain
+  ) @_dummy
   (#not-type? @argumentOrParameter "comment")
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
 
-;;!! function(bar){ }
-;;!           ^^^
+;;!! function(a, b){ }
+;;!           ^^^^
 (_
   parameters: (parameters
     open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
@@ -61,6 +58,17 @@
   (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
 ) @argumentList.domain @argumentOrParameter.iteration.domain
 
+;;!! foo(a, b)
+;;!      ^^^^
+(_
+  arguments: (arguments
+    open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
+    ;; (parameter) @argumentOrParameter
+    close: ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
+  ) @_dummy
+  (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
+) @argumentList.domain @argumentOrParameter.iteration.domain
+
 (arguments
   "(" @argumentOrParameter.iteration.start.endOf
   ")" @argumentOrParameter.iteration.end.startOf