Remove function name from argument iteration scope

Author: BlueDrink9

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

@@ -6,8 +6,8 @@ foo(x, y)
       >----<
 0| foo(x, y)
 
-[#1 Domain] = 0:0-0:9
-  >---------<
+[#1 Domain] = 0:3-0:9
+     >------<
 0| foo(x, y)
 
 

data/fixtures/scopes/r/argument.formal.iteration.scope

@@ -1,42 +1,17 @@
-abc <- function(
-    x,
-    y
-){
-}
+abc <- function(x, y){}
 
 ---
 
-[#1 Range] = 0:16-3:0
-                  >
-0| abc <- function(
-1|     x,
-2|     y
-3| ){
-   <
+[#1 Range] = 0:16-0:20
+                  >----<
+0| abc <- function(x, y){}
 
-[#1 Domain] = 0:0-4:1
-  >----------------
-0| abc <- function(
-1|     x,
-2|     y
-3| ){
-4| }
-   -<
+[#1 Domain] = 0:15-0:21
+                 >------<
+0| abc <- function(x, y){}
 
 
-[#2 Range] = 0:16-3:0
-                  >
-0| abc <- function(
-1|     x,
-2|     y
-3| ){
-   <
-
-[#2 Domain] = 0:7-4:1
-         >---------
-0| abc <- function(
-1|     x,
-2|     y
-3| ){
-4| }
-   -<
+[#2 Range] =
+[#2 Domain] = 0:16-0:20
+                  >----<
+0| abc <- function(x, y){}

queries/r.scm

@@ -93,7 +93,7 @@
    arguments: (arguments
      open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
      close: ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
-     ) @_dummy
+     ) @_dummy @argumentOrParameter.iteration.domain
    (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
   )
 
@@ -104,10 +104,10 @@
    parameters: (parameters
      open: "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf
      close: ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf
-     ) @_dummy
+     ) @_dummy @argumentOrParameter.iteration.domain
    (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
   )
-] @argumentList.domain @argumentOrParameter.iteration.domain
+] @argumentList.domain
 
 (arguments
   "(" @argumentOrParameter.iteration.start.endOf
@@ -141,7 +141,7 @@
      ) @_dummy
    (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n")
   )
-] @argumentList.domain @argumentOrParameter.iteration.domain
+] @argumentList.domain
 
 
 ;; Function calls