Don't yield empty iteration scopes (#2968)

AndreasArvidsson · web-flow · commit 66001b40d2f3 · 2025-06-18T13:24:25.000+02:00
Fixes #2944
diff --git a/data/fixtures/scopes/c/name.argument.formal.iteration2.scope b/data/fixtures/scopes/c/name.argument.formal.iteration2.scope
@@ -11,9 +11,3 @@ void aaa(int bbb, int ccc) {}
 [#2 Domain] = 0:9-0:25
            >----------------<
 0| void aaa(int bbb, int ccc) {}
-
-
-[#3 Range] =
-[#3 Domain] = 0:28-0:28
-                              ><
-0| void aaa(int bbb, int ccc) {}
diff --git a/data/fixtures/scopes/c/name.iteration.block2.scope b/data/fixtures/scopes/c/name.iteration.block2.scope
@@ -8,12 +8,6 @@ void foo() { }
 
 
 [#2 Range] =
-[#2 Domain] = 0:9-0:9
-           ><
-0| void foo() { }
-
-
-[#3 Range] =
-[#3 Domain] = 0:12-0:13
+[#2 Domain] = 0:12-0:13
               >-<
 0| void foo() { }
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope
@@ -25,9 +25,3 @@ class MyClass {
 [#3 Domain] = 1:12-1:32
               >--------------------<
 1|     MyClass(int aaa, int bbb = 2) {}
-
-
-[#4 Range] =
-[#4 Domain] = 1:35-1:35
-                                     ><
-1|     MyClass(int aaa, int bbb = 2) {}
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.iteration.scope b/data/fixtures/scopes/cpp/name.argument.formal.iteration.scope
@@ -11,9 +11,3 @@ void aaa(int bbb = 0, int ccc = 0) {}
 [#2 Domain] = 0:9-0:33
            >------------------------<
 0| void aaa(int bbb = 0, int ccc = 0) {}
-
-
-[#3 Range] =
-[#3 Domain] = 0:36-0:36
-                                      ><
-0| void aaa(int bbb = 0, int ccc = 0) {}
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/name.argument.formal.method.iteration.scope
@@ -25,9 +25,3 @@ class MyClass {
 [#3 Domain] = 1:13-1:33
                >--------------------<
 1|     void foo(int aaa, int bbb = 2) {}
-
-
-[#4 Range] =
-[#4 Domain] = 1:36-1:36
-                                      ><
-1|     void foo(int aaa, int bbb = 2) {}
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/name.argument.formal.constructor.iteration.scope
@@ -25,9 +25,3 @@ class MyClass {
 [#3 Domain] = 1:12-1:28
               >----------------<
 1|     MyClass(int foo, int bar) {}
-
-
-[#4 Range] =
-[#4 Domain] = 1:31-1:31
-                                 ><
-1|     MyClass(int foo, int bar) {}
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/name.argument.formal.iteration.scope
@@ -11,9 +11,3 @@ void myFunk(String name, int value) {}
 [#2 Domain] = 0:12-0:34
               >----------------------<
 0| void myFunk(String name, int value) {}
-
-
-[#3 Range] =
-[#3 Domain] = 0:37-0:37
-                                       ><
-0| void myFunk(String name, int value) {}
diff --git a/data/fixtures/scopes/csharp/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/name.argument.formal.method.iteration.scope
@@ -25,9 +25,3 @@ class MyClass {
 [#3 Domain] = 1:14-1:30
                 >----------------<
 1|     void funk(int foo, int bar) {}
-
-
-[#4 Range] =
-[#4 Domain] = 1:33-1:33
-                                   ><
-1|     void funk(int foo, int bar) {}
diff --git a/data/fixtures/scopes/csharp/name.iteration.block2.scope b/data/fixtures/scopes/csharp/name.iteration.block2.scope
@@ -8,12 +8,6 @@ void MyFunk() { }
 
 
 [#2 Range] =
-[#2 Domain] = 0:12-0:12
-              ><
-0| void MyFunk() { }
-
-
-[#3 Range] =
-[#3 Domain] = 0:15-0:16
+[#2 Domain] = 0:15-0:16
                  >-<
 0| void MyFunk() { }
diff --git a/data/fixtures/scopes/csharp/name.iteration.document.scope b/data/fixtures/scopes/csharp/name.iteration.document.scope
@@ -3,16 +3,10 @@ class MyClass {}
 
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:0-2:0
+[Range] =
+[Domain] = 0:0-2:0
   >
 0|
 1| class MyClass {}
 2|
    <
-
-
-[#2 Range] =
-[#2 Domain] = 1:15-1:15
-                 ><
-1| class MyClass {}
diff --git a/data/fixtures/scopes/csharp/statement.iteration.document.scope b/data/fixtures/scopes/csharp/statement.iteration.document.scope
@@ -3,16 +3,10 @@ class MyClass {}
 
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:0-2:0
+[Range] =
+[Domain] = 0:0-2:0
   >
 0|
 1| class MyClass {}
 2|
    <
-
-
-[#2 Range] =
-[#2 Domain] = 1:15-1:15
-                 ><
-1| class MyClass {}
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/type.argument.formal.constructor.iteration.scope
@@ -16,9 +16,3 @@ class MyClass {
 [#2 Domain] = 1:12-1:24
               >------------<
 1|     MyClass(int a, int b) {}
-
-
-[#3 Range] =
-[#3 Domain] = 1:27-1:27
-                             ><
-1|     MyClass(int a, int b) {}
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/type.argument.formal.iteration.scope
@@ -1,13 +1,7 @@
 void myFunk(String name, int value) {}
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:12-0:34
+[Range] =
+[Domain] = 0:12-0:34
               >----------------------<
 0| void myFunk(String name, int value) {}
-
-
-[#2 Range] =
-[#2 Domain] = 0:37-0:37
-                                       ><
-0| void myFunk(String name, int value) {}
diff --git a/data/fixtures/scopes/csharp/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/type.argument.formal.method.iteration.scope
@@ -16,9 +16,3 @@ class MyClass {
 [#2 Domain] = 1:14-1:26
                 >------------<
 1|     void funk(int a, int b) {}
-
-
-[#3 Range] =
-[#3 Domain] = 1:29-1:29
-                               ><
-1|     void funk(int a, int b) {}
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/value.argument.formal.constructor.iteration.scope
@@ -16,9 +16,3 @@ class MyClass {
 [#2 Domain] = 1:12-1:32
               >--------------------<
 1|     MyClass(int a = 1, int b = 2) {}
-
-
-[#3 Range] =
-[#3 Domain] = 1:35-1:35
-                                     ><
-1|     MyClass(int a = 1, int b = 2) {}
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/value.argument.formal.iteration.scope
@@ -1,13 +1,7 @@
 void myFunk(String name, int value = 5) {}
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:12-0:38
+[Range] =
+[Domain] = 0:12-0:38
               >--------------------------<
 0| void myFunk(String name, int value = 5) {}
-
-
-[#2 Range] =
-[#2 Domain] = 0:41-0:41
-                                           ><
-0| void myFunk(String name, int value = 5) {}
diff --git a/data/fixtures/scopes/csharp/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/value.argument.formal.method.iteration.scope
@@ -16,9 +16,3 @@ class MyClass {
 [#2 Domain] = 1:14-1:34
                 >--------------------<
 1|     void funk(int a = 1, int b = 2) {}
-
-
-[#3 Range] =
-[#3 Domain] = 1:37-1:37
-                                       ><
-1|     void funk(int a = 1, int b = 2) {}
diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope
@@ -22,37 +22,31 @@ public class MyClass {
    <
 
 
-[#2 Range] =
-[#2 Domain] = 1:23-1:23
-                         ><
-1|     public void myFunk() {
-
-
-[#3 Range] = 2:8-2:24
+[#2 Range] = 2:8-2:24
           >----------------<
 2|         String foo, bar;
 
-[#3 Domain] = 1:26-3:4
+[#2 Domain] = 1:26-3:4
                             >
 1|     public void myFunk() {
 2|         String foo, bar;
 3|     }
    ----<
 
 
-[#4 Range] = 2:8-2:24
+[#3 Range] = 2:8-2:24
           >----------------<
 2|         String foo, bar;
 
-[#4 Domain] = 2:0-2:24
+[#3 Domain] = 2:0-2:24
   >------------------------<
 2|         String foo, bar;
 
 
-[#5 Range] = 2:15-2:23
+[#4 Range] = 2:15-2:23
                  >--------<
 2|         String foo, bar;
 
-[#5 Domain] = 2:8-2:24
+[#4 Domain] = 2:8-2:24
           >----------------<
 2|         String foo, bar;
diff --git a/data/fixtures/scopes/java/name.iteration.block.scope b/data/fixtures/scopes/java/name.iteration.block.scope
@@ -27,25 +27,16 @@ public class MyClass {
    <
 
 
-[#3 Range] = 1:22-1:22
-                        ><
-1|    public void myFunk() {
-
-[#3 Domain] = 1:21-1:23
-                       >--<
-1|    public void myFunk() {
-
-
-[#4 Range] =
-[#4 Domain] = 1:25-3:3
+[#3 Range] =
+[#3 Domain] = 1:25-3:3
                            >
 1|    public void myFunk() {
 2|     if (true) { }
 3|    }
    ---<
 
 
-[#5 Range] =
-[#5 Domain] = 2:15-2:16
+[#4 Range] =
+[#4 Domain] = 2:15-2:16
                  >-<
 2|     if (true) { }
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block.scope b/data/fixtures/scopes/javascript.core/name.iteration.block.scope
@@ -22,12 +22,6 @@ class MyClass {
 
 
 [#3 Range] =
-[#3 Domain] = 1:11-1:11
-             ><
-1|     myFunk() { }
-
-
-[#4 Range] =
-[#4 Domain] = 1:14-1:15
+[#3 Domain] = 1:14-1:15
                 >-<
 1|     myFunk() { }
diff --git a/data/fixtures/scopes/javascript.core/name.iteration.block2.scope b/data/fixtures/scopes/javascript.core/name.iteration.block2.scope
@@ -8,12 +8,6 @@ function myFunk() { }
 
 
 [#2 Range] =
-[#2 Domain] = 0:16-0:16
-                  ><
-0| function myFunk() { }
-
-
-[#3 Range] =
-[#3 Domain] = 0:19-0:20
+[#2 Domain] = 0:19-0:20
                      >-<
 0| function myFunk() { }
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration3.scope
@@ -2,25 +2,19 @@ def foo():
     global bar, baz
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:8-0:8
-          ><
-0| def foo():
-
-
-[#2 Range] = 1:4-1:19
+[#1 Range] = 1:4-1:19
       >---------------<
 1|     global bar, baz
 
-[#2 Domain] = 1:0-1:19
+[#1 Domain] = 1:0-1:19
   >-------------------<
 1|     global bar, baz
 
 
-[#3 Range] = 1:11-1:19
+[#2 Range] = 1:11-1:19
              >--------<
 1|     global bar, baz
 
-[#3 Domain] = 1:4-1:19
+[#2 Domain] = 1:4-1:19
       >---------------<
 1|     global bar, baz
diff --git a/data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope b/data/fixtures/scopes/python/collectionItem.unenclosed.iteration4.scope
@@ -3,12 +3,12 @@ for key, value in map.items():
 ---
 
 [#1 Range] =
-[#1 Domain] = 0:4-0:14
-      >----------<
+[#1 Domain] = 0:0-0:30
+  >------------------------------<
 0| for key, value in map.items():
 
 
 [#2 Range] =
-[#2 Domain] = 0:28-0:28
-                              ><
+[#2 Domain] = 0:4-0:14
+      >----------<
 0| for key, value in map.items():
diff --git a/data/fixtures/scopes/scss/name.argument.formal.iteration.scope b/data/fixtures/scopes/scss/name.argument.formal.iteration.scope
@@ -14,9 +14,3 @@
 [#2 Domain] = 0:19-0:40
                      >---------------------<
 0| @mixin replace-text($image, $color: red) {}
-
-
-[#3 Range] =
-[#3 Domain] = 0:42-0:42
-                                            ><
-0| @mixin replace-text($image, $color: red) {}
diff --git a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope
@@ -14,9 +14,3 @@
 [#2 Domain] = 0:19-0:40
                      >---------------------<
 0| @mixin replace-text($image, $color: red) {}
-
-
-[#3 Range] =
-[#3 Domain] = 0:42-0:42
-                                            ><
-0| @mixin replace-text($image, $color: red) {}
diff --git a/data/fixtures/scopes/textual/surroundingPair.iteration.scope b/data/fixtures/scopes/textual/surroundingPair.iteration.scope
@@ -3,19 +3,7 @@
 
 ---
 
-[#1 Range] =
-[#1 Domain] = 0:0-0:0
-  ><
-0|
-
-
-[#2 Range] =
-[#2 Domain] = 1:0-1:3
+[Range] =
+[Domain] = 1:0-1:3
   >---<
 1| ( )
-
-
-[#3 Range] =
-[#3 Domain] = 2:0-2:0
-  ><
-2|
diff --git a/data/fixtures/scopes/textual/surroundingPair.iteration2.scope b/data/fixtures/scopes/textual/surroundingPair.iteration2.scope
diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/collectionItemTextualIterationScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/collectionItemTextualIterationScopeHandler.ts
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/SurroundingPairScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/SurroundingPairScopeHandler.ts
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterIterationScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/TreeSitterScopeHandler/TreeSitterIterationScopeHandler.ts
diff --git a/packages/cursorless-vscode-e2e/src/suite/scopeProvider/runBasicScopeInfoTest.ts b/packages/cursorless-vscode-e2e/src/suite/scopeProvider/runBasicScopeInfoTest.ts
diff --git a/packages/cursorless-vscode-e2e/src/suite/scopeProvider/runSurroundingPairScopeInfoTest.ts b/packages/cursorless-vscode-e2e/src/suite/scopeProvider/runSurroundingPairScopeInfoTest.ts
