Include callee in domain for argument iteration scope (#2936)

AndreasArvidsson · web-flow · commit bfe40406ce2b · 2025-05-29T09:54:39.000Z
Fixes #2930
diff --git a/data/fixtures/recorded/languages/typescript/takeEveryArgRam.yml b/data/fixtures/recorded/languages/typescript/takeEveryArgRam.yml
@@ -23,7 +23,7 @@ initialState:
 finalState:
   documentContents: foo(bar(baz, bongo), bazman)
   selections:
-    - anchor: {line: 0, character: 4}
-      active: {line: 0, character: 19}
-    - anchor: {line: 0, character: 21}
-      active: {line: 0, character: 27}
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 11}
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 18}
diff --git a/data/fixtures/scopes/csharp/argument.actual.iteration.scope b/data/fixtures/scopes/csharp/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ Foo(5, "bar");
       >--------<
 0| Foo(5, "bar");
 
-[Domain] = 0:3-0:13
-     >----------<
+[Domain] = 0:0-0:13
+  >-------------<
 0| Foo(5, "bar");
diff --git a/data/fixtures/scopes/css/argument.actual.iteration.scope b/data/fixtures/scopes/css/argument.actual.iteration.scope
@@ -7,6 +7,6 @@
                 >-----------<
 1|   width: calc(100% - 50px);
 
-[Domain] = 1:13-1:26
-               >-------------<
+[Domain] = 1:9-1:26
+           >-----------------<
 1|   width: calc(100% - 50px);
diff --git a/data/fixtures/scopes/css/argument.actual.iteration2.scope b/data/fixtures/scopes/css/argument.actual.iteration2.scope
@@ -7,6 +7,6 @@
                                           >----------------<
 1|   background: repeating-linear-gradient(red, orange 50px);
 
-[Domain] = 1:39-1:57
-                                         >------------------<
+[Domain] = 1:14-1:57
+                >-------------------------------------------<
 1|   background: repeating-linear-gradient(red, orange 50px);
diff --git a/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope
@@ -5,6 +5,6 @@ new Foo(123, 456);
           >--------<
 0| new Foo(123, 456);
 
-[Domain] = 0:7-0:17
-         >----------<
+[Domain] = 0:0-0:17
+  >-----------------<
 0| new Foo(123, 456);
diff --git a/data/fixtures/scopes/java/argument.actual.iteration.scope b/data/fixtures/scopes/java/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ myFunk(5, "hello");
          >----------<
 0| myFunk(5, "hello");
 
-[Domain] = 0:6-0:18
-        >------------<
+[Domain] = 0:0-0:18
+  >------------------<
 0| myFunk(5, "hello");
diff --git a/data/fixtures/scopes/java/argument.actual.method.iteration.scope b/data/fixtures/scopes/java/argument.actual.method.iteration.scope
@@ -5,6 +5,6 @@ foo.bar(123, 456);
           >--------<
 0| foo.bar(123, 456);
 
-[Domain] = 0:7-0:17
-         >----------<
+[Domain] = 0:0-0:17
+  >-----------------<
 0| foo.bar(123, 456);
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope
@@ -5,6 +5,6 @@ new Aaa(bbb, ccc)
           >--------<
 0| new Aaa(bbb, ccc)
 
-[Domain] = 0:7-0:17
-         >----------<
+[Domain] = 0:0-0:17
+  >-----------------<
 0| new Aaa(bbb, ccc)
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ aaa(bbb, ccc);
       >--------<
 0| aaa(bbb, ccc);
 
-[Domain] = 0:3-0:13
-     >----------<
+[Domain] = 0:0-0:13
+  >-------------<
 0| aaa(bbb, ccc);
diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope
@@ -5,6 +5,6 @@ aaa.bbb(ccc, ddd);
           >--------<
 0| aaa.bbb(ccc, ddd);
 
-[Domain] = 0:7-0:17
-         >----------<
+[Domain] = 0:0-0:17
+  >-----------------<
 0| aaa.bbb(ccc, ddd);
diff --git a/data/fixtures/scopes/php/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/php/argument.actual.constructor.iteration.scope
@@ -6,6 +6,6 @@ new MyClass(2, "foo")
               >--------<
 1| new MyClass(2, "foo")
 
-[Domain] = 1:11-1:21
-             >----------<
+[Domain] = 1:0-1:21
+  >---------------------<
 1| new MyClass(2, "foo")
diff --git a/data/fixtures/scopes/php/argument.actual.iteration.scope b/data/fixtures/scopes/php/argument.actual.iteration.scope
@@ -6,6 +6,6 @@ myFunc(2, "foo")
          >--------<
 1| myFunc(2, "foo")
 
-[Domain] = 1:6-1:16
-        >----------<
+[Domain] = 1:0-1:16
+  >----------------<
 1| myFunc(2, "foo")
diff --git a/data/fixtures/scopes/php/argument.actual.method.iteration.scope b/data/fixtures/scopes/php/argument.actual.method.iteration.scope
@@ -1,11 +1,11 @@
 <?php
-obj.myFunc(2, "foo")
+obj.myFunc(2, "foo");
 ---
 
 [Range] = 1:11-1:19
              >--------<
-1| obj.myFunc(2, "foo")
+1| obj.myFunc(2, "foo");
 
-[Domain] = 1:10-1:20
-            >----------<
-1| obj.myFunc(2, "foo")
+[Domain] = 1:0-1:20
+  >--------------------<
+1| obj.myFunc(2, "foo");
diff --git a/data/fixtures/scopes/python/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/python/argument.actual.constructor.iteration.scope
@@ -5,6 +5,6 @@ Foo(123, 456)
       >--------<
 0| Foo(123, 456)
 
-[Domain] = 0:3-0:13
-     >----------<
+[Domain] = 0:0-0:13
+  >-------------<
 0| Foo(123, 456)
diff --git a/data/fixtures/scopes/python/argument.actual.iteration.scope b/data/fixtures/scopes/python/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ foo("bar", 1)
       >--------<
 0| foo("bar", 1)
 
-[Domain] = 0:3-0:13
-     >----------<
+[Domain] = 0:0-0:13
+  >-------------<
 0| foo("bar", 1)
diff --git a/data/fixtures/scopes/python/argument.actual.method.iteration.scope b/data/fixtures/scopes/python/argument.actual.method.iteration.scope
@@ -5,6 +5,6 @@ foo.bar(123, 456)
           >--------<
 0| foo.bar(123, 456)
 
-[Domain] = 0:7-0:17
-         >----------<
+[Domain] = 0:0-0:17
+  >-----------------<
 0| foo.bar(123, 456)
diff --git a/data/fixtures/scopes/r/argument.actual.iteration.scope b/data/fixtures/scopes/r/argument.actual.iteration.scope
@@ -1,17 +1,10 @@
 foo(x, y)
-
 ---
 
-[#1 Range] = 0:4-0:8
+[Range] = 0:4-0:8
       >----<
 0| foo(x, y)
 
-[#1 Domain] = 0:3-0:9
-     >------<
-0| foo(x, y)
-
-
-[#2 Range] =
-[#2 Domain] = 0:4-0:8
-      >----<
+[Domain] = 0:0-0:9
+  >---------<
 0| foo(x, y)
diff --git a/data/fixtures/scopes/r/argument.formal.iteration.scope b/data/fixtures/scopes/r/argument.formal.iteration.scope
@@ -1,17 +1,10 @@
 abc <- function(x, y){}
-
 ---
 
-[#1 Range] = 0:16-0:20
+[Range] = 0:16-0:20
                   >----<
 0| abc <- function(x, y){}
 
-[#1 Domain] = 0:0-0:23
+[Domain] = 0:0-0:23
   >-----------------------<
 0| abc <- function(x, y){}
-
-
-[#2 Range] =
-[#2 Domain] = 0:16-0:20
-                  >----<
-0| abc <- function(x, y){}
diff --git a/data/fixtures/scopes/r/argumentList.formal.scope b/data/fixtures/scopes/r/argumentList.formal.scope
@@ -1,25 +1,13 @@
 abc <- function(x, y){ }
 ---
 
-[#1 Content] =
-[#1 Removal] = 0:16-0:20
+[Content] =
+[Removal] = 0:16-0:20
                   >----<
 0| abc <- function(x, y){ }
 
-[#1 Domain] = 0:0-0:24
+[Domain] = 0:0-0:24
   >------------------------<
 0| abc <- function(x, y){ }
 
-[#1 Insertion delimiter] = ", "
-
-
-[#2 Content] =
-[#2 Removal] = 0:16-0:20
-                  >----<
-0| abc <- function(x, y){ }
-
-[#2 Domain] = 0:7-0:24
-         >-----------------<
-0| abc <- function(x, y){ }
-
-[#2 Insertion delimiter] = ", "
+[Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/r/argumentList.formal2.scope b/data/fixtures/scopes/r/argumentList.formal2.scope
@@ -1,25 +1,13 @@
 abc <- function(){ }
 ---
 
-[#1 Content] =
-[#1 Removal] = 0:16-0:16
+[Content] =
+[Removal] = 0:16-0:16
                   ><
 0| abc <- function(){ }
 
-[#1 Domain] = 0:0-0:20
+[Domain] = 0:0-0:20
   >--------------------<
 0| abc <- function(){ }
 
-[#1 Insertion delimiter] = ""
-
-
-[#2 Content] =
-[#2 Removal] = 0:16-0:16
-                  ><
-0| abc <- function(){ }
-
-[#2 Domain] = 0:7-0:20
-         >-------------<
-0| abc <- function(){ }
-
-[#2 Insertion delimiter] = ""
+[Insertion delimiter] = ""
diff --git a/data/fixtures/scopes/r/argumentList.formal3.scope b/data/fixtures/scopes/r/argumentList.formal3.scope
@@ -5,16 +5,16 @@ abc <- function(
 }
 ---
 
-[#1 Content] =
-[#1 Removal] = 0:16-3:0
+[Content] =
+[Removal] = 0:16-3:0
                   >
 0| abc <- function(
 1|     x,
 2|     y
 3| ){
    <
 
-[#1 Domain] = 0:0-4:1
+[Domain] = 0:0-4:1
   >----------------
 0| abc <- function(
 1|     x,
@@ -23,25 +23,4 @@ abc <- function(
 4| }
    -<
 
-[#1 Insertion delimiter] = ",\n"
-
-
-[#2 Content] =
-[#2 Removal] = 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 Insertion delimiter] = ",\n"
+[Insertion delimiter] = ",\n"
diff --git a/data/fixtures/scopes/talon/argument.actual.iteration.scope b/data/fixtures/scopes/talon/argument.actual.iteration.scope
@@ -5,6 +5,6 @@ command: user.do_something(123, 456)
                              >--------<
 0| command: user.do_something(123, 456)
 
-[Domain] = 0:26-0:36
-                            >----------<
+[Domain] = 0:9-0:36
+           >---------------------------<
 0| command: user.do_something(123, 456)
diff --git a/data/fixtures/scopes/talon/argument.actual.iteration2.scope b/data/fixtures/scopes/talon/argument.actual.iteration2.scope
@@ -1,7 +1,10 @@
 command: key(enter)
 ---
 
-[Range] =
-[Domain] = 0:13-0:18
+[Range] = 0:13-0:18
                >-----<
 0| command: key(enter)
+
+[Domain] = 0:9-0:19
+           >----------<
+0| command: key(enter)
diff --git a/queries/c.scm b/queries/c.scm
@@ -241,9 +241,11 @@
   )
 ) @argumentOrParameter.iteration.domain
 
-(argument_list
-  "(" @argumentOrParameter.iteration.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf
-  ")" @argumentOrParameter.iteration.end.startOf @name.iteration.end.startOf @value.iteration.end.startOf
+(_
+  (argument_list
+    "(" @argumentOrParameter.iteration.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf
+    ")" @argumentOrParameter.iteration.end.startOf @name.iteration.end.startOf @value.iteration.end.startOf
+  )
 ) @argumentOrParameter.iteration.domain
 
 operator: [
diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -284,20 +284,20 @@
   ")" @name.iteration.end.startOf @value.iteration.end.startOf @type.iteration.end.startOf
 )
 
-(argument_list
-  "(" @argumentOrParameter.iteration.start.endOf
-  ")" @argumentOrParameter.iteration.end.startOf
+(_
+  (argument_list
+    "(" @argumentOrParameter.iteration.start.endOf
+    ")" @argumentOrParameter.iteration.end.startOf
+  )
 ) @argumentOrParameter.iteration.domain
 
 ;; Treat interior of all bodies as iteration scopes for `name`, eg
 ;;!! void foo() {   }
 ;;!              ***
 (_
   body: (_
-    .
     "{" @name.iteration.start.endOf @value.iteration.start.endOf @type.iteration.start.endOf
     "}" @name.iteration.end.startOf @value.iteration.end.startOf @type.iteration.end.startOf
-    .
   )
 )
 
diff --git a/queries/css.scm b/queries/css.scm
@@ -88,11 +88,11 @@
   (#insertion-delimiter! @argumentOrParameter ", ")
 )
 
-(arguments
-  .
-  "(" @argumentOrParameter.iteration.start.endOf
-  ")" @argumentOrParameter.iteration.end.startOf
-  .
+(_
+  (arguments
+    "(" @argumentOrParameter.iteration.start.endOf
+    ")" @argumentOrParameter.iteration.end.startOf
+  )
 ) @argumentOrParameter.iteration.domain
 
 ;; Entire file
@@ -107,10 +107,8 @@
 
 ;; { }
 (block
-  .
   "{" @name.iteration.start.endOf @collectionKey.iteration.start.endOf @value.iteration.start.endOf
   "}" @name.iteration.end.startOf @collectionKey.iteration.end.startOf @value.iteration.end.startOf
-  .
 ) @map
 
 ;;!! width: 100px;
diff --git a/queries/go.scm b/queries/go.scm
diff --git a/queries/java.scm b/queries/java.scm
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
diff --git a/queries/php.scm b/queries/php.scm
diff --git a/queries/python.scm b/queries/python.scm
diff --git a/queries/r.scm b/queries/r.scm
diff --git a/queries/talon.scm b/queries/talon.scm
