r

Author: AndreasArvidsson

data/fixtures/scopes/r/argumentList/argumentList.actual.method.multiLine.scope

@@ -4,7 +4,12 @@ foo.bar(
 )
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:8-3:0
           >
 0| foo.bar(
@@ -13,6 +18,10 @@ foo.bar(
 3| )
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:1
   >--------
 0| foo.bar(

data/fixtures/scopes/r/argumentList/argumentList.actual.multiLine.scope

@@ -4,7 +4,12 @@ foo(
 )
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:4-3:0
       >
 0| foo(
@@ -13,6 +18,10 @@ foo(
 3| )
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:1
   >----
 0| foo(

data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope

@@ -4,7 +4,12 @@ function(
 ) { }
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:9-3:0
            >
 0| function(
@@ -13,6 +18,10 @@ function(
 3| ) { }
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-3:5
   >---------
 0| function(

data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope

@@ -5,7 +5,12 @@ abc <- function(
 }
 ---
 
-[Content] =
+[Content] = 1:4-2:7
+      >----
+1|     aaa,
+2|     bbb
+   -------<
+
 [Removal] = 0:16-3:0
                   >
 0| abc <- function(
@@ -14,6 +19,10 @@ abc <- function(
 3| ){
    <
 
+[Leading delimiter] = 1:0-1:4
+  >----<
+1|     aaa,
+
 [Domain] = 0:0-4:1
   >----------------
 0| abc <- function(

queries/r.scm

@@ -90,10 +90,11 @@
 ;;!      ^^^^
 (call
   (arguments
-    open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-    close: ")" @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
 
 ;; argumentList.formal
@@ -102,10 +103,11 @@
 (binary_operator
   (function_definition
     (parameters
-      open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-      close: ")" @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
 
@@ -115,10 +117,11 @@
 (
   (function_definition
     (parameters
-      open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
-      close: ")" @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
   (#not-parent-type? @argumentList.domain binary_operator)
 )