Split argument and parameter scope tests and include delimiter inquiry

Author: BlueDrink9

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

@@ -1,30 +1,33 @@
-func(1)
-func(...)
-func(x=1)
+func(x, y)
 ---
 
 [#1 Content] =
-[#1 Removal] =
 [#1 Domain] = 0:5-0:6
        >-<
-0| func(1)
+0| func(x, y)
 
-[#1 Insertion delimiter] = " "
+[#1 Removal] = 0:5-0:7
+       >--<
+0| func(x, y)
 
+[#1 Trailing delimiter] = 0:6-0:7
+        >-<
+0| func(x, y)
+
+[#1 Insertion delimiter] = ", "
 
-[#2 Content] =
-[#2 Removal] =
-[#2 Domain] = 1:5-1:8
-       >---<
-1| func(...)
 
-[#2 Insertion delimiter] = " "
+[#2 Content] =
+[#2 Domain] = 0:8-0:9
+          >-<
+0| func(x, y)
 
+[#2 Removal] = 0:7-0:9
+         >--<
+0| func(x, y)
 
-[#3 Content] =
-[#3 Removal] =
-[#3 Domain] = 2:5-2:8
-       >---<
-2| func(x=1)
+[#2 Leading delimiter] = 0:7-0:8
+         >-<
+0| func(x, y)
 
-[#3 Insertion delimiter] = " "
+[#2 Insertion delimiter] = ", "

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

@@ -0,0 +1,10 @@
+func(1)
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:5-0:6
+       >-<
+0| func(1)
+
+[Insertion delimiter] = ", "

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

@@ -0,0 +1,10 @@
+func(...)
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:5-0:8
+       >---<
+0| func(...)
+
+[Insertion delimiter] = ", "

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

@@ -0,0 +1,10 @@
+func(x=1)
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:5-0:8
+       >---<
+0| func(x=1)
+
+[Insertion delimiter] = ", "

data/fixtures/scopes/r/argumentList.formal2.scope

@@ -0,0 +1,13 @@
+abc <- function(){ }
+---
+
+[Content] =
+[Removal] = 0:16-0:16
+                  ><
+0| abc <- function(){ }
+
+[Domain] = 0:7-0:20
+         >-------------<
+0| abc <- function(){ }
+
+[Insertion delimiter] = ""

queries/r.scm

@@ -27,9 +27,6 @@
 ;;   alternative: (braced_expression)? @branch.end
 ;; ) @branch.iteration
 
-;;!! foo(x)
-;;!      ^
-(argument) @argumentOrParameter
 ;;!! foo(x)
 ;;!  ^^^^^^
 (call) @functionCall
@@ -38,26 +35,37 @@
 ;;!  ^^^^^^^^^^^^^^
 (function_definition) @anonymousFunction
 
-;;!! function("bar")
-;;!           ^^^^^
-(
-  (parameters
+;;!! foo("bar")
+;;!      ^^^^^
+(_
+  arguments: (arguments
     (_)? @_.leading.endOf
     .
-    (_) @argumentOrParameter
+    (argument) @argumentOrParameter
     .
-    (_)? @_.trailing.startOf
-  ) @_dummy
+    (_)? @_.trailing.endOf
+  )
+  @_dummy
+  (#not-type? @argumentOrParameter "comment")
   (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n")
 )
+
+;;!! function(bar){ }
+;;!           ^^^
 (_
-  parameters: (_
-    "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-    ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
+  parameters: (parameters
+    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
+) @argumentOrParameter.iteration.domain
+
 (parameters
   "(" @argumentOrParameter.iteration.start.endOf
   ")" @argumentOrParameter.iteration.end.startOf