Added missing scope implementations

AndreasArvidsson · AndreasArvidsson · commit 121e99cd2763 · 2025-06-08T12:44:09.000+02:00
diff --git a/data/fixtures/scopes/cpp/branch.try.iteration.scope b/data/fixtures/scopes/cpp/branch.try.iteration.scope
@@ -0,0 +1,10 @@
+try {}
+catch (const std::exception& e) {}
+---
+
+[Range] =
+[Domain] = 0:0-1:34
+  >------
+0| try {}
+1| catch (const std::exception& e) {}
+   ----------------------------------<
diff --git a/data/fixtures/scopes/cpp/branch.try.scope b/data/fixtures/scopes/cpp/branch.try.scope
@@ -0,0 +1,30 @@
+try {}
+catch (const std::exception& e) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:6
+  >------<
+0| try {}
+
+[#1 Removal] = 0:0-1:0
+  >------
+0| try {}
+1| catch (const std::exception& e) {}
+   <
+
+[#1 Insertion delimiter] = "\n"
+
+
+[#2 Content] =
+[#2 Domain] = 1:0-1:34
+  >----------------------------------<
+1| catch (const std::exception& e) {}
+
+[#2 Removal] = 0:6-1:34
+        >
+0| try {}
+1| catch (const std::exception& e) {}
+   ----------------------------------<
+
+[#2 Insertion delimiter] = "\n"
diff --git a/data/fixtures/scopes/cpp/functionCall.constructor.scope b/data/fixtures/scopes/cpp/functionCall.constructor.scope
@@ -0,0 +1,10 @@
+new Foo();
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:9
+  >---------<
+0| new Foo();
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/functionCallee.constructor.scope b/data/fixtures/scopes/cpp/functionCallee.constructor.scope
@@ -0,0 +1,13 @@
+new Foo();
+---
+
+[Content] =
+[Removal] = 0:0-0:7
+  >-------<
+0| new Foo();
+
+[Domain] = 0:0-0:9
+  >---------<
+0| new Foo();
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope b/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope
@@ -0,0 +1,13 @@
+class MyClass { }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
+
+
+[#2 Range] =
+[#2 Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }
diff --git a/data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/name.argument.formal.constructor.iteration.scope
@@ -13,12 +13,21 @@ class MyClass {
 
 
 [#2 Range] =
-[#2 Domain] = 1:12-1:32
-              >--------------------<
+[#2 Domain] = 0:15-2:0
+                 >
+0| class MyClass {
 1|     MyClass(int aaa, int bbb = 2) {}
+2| }
+   <
 
 
 [#3 Range] =
-[#3 Domain] = 1:35-1:35
+[#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.method.iteration.scope b/data/fixtures/scopes/cpp/name.argument.formal.method.iteration.scope
@@ -13,12 +13,21 @@ class MyClass {
 
 
 [#2 Range] =
-[#2 Domain] = 1:13-1:33
-               >--------------------<
+[#2 Domain] = 0:15-2:0
+                 >
+0| class MyClass {
 1|     void foo(int aaa, int bbb = 2) {}
+2| }
+   <
 
 
 [#3 Range] =
-[#3 Domain] = 1:36-1:36
+[#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/cpp/name.field.scope b/data/fixtures/scopes/cpp/name.field.scope
@@ -1,43 +1,52 @@
-class aaa { int bbb; };
+class Foo {
+    int aaa = 2;
+}
 ---
 
 [#1 Content] = 0:6-0:9
         >---<
-0| class aaa { int bbb; };
+0| class Foo {
 
 [#1 Removal] = 0:6-0:10
         >----<
-0| class aaa { int bbb; };
+0| class Foo {
 
 [#1 Leading delimiter] = 0:5-0:6
        >-<
-0| class aaa { int bbb; };
+0| class Foo {
 
 [#1 Trailing delimiter] = 0:9-0:10
            >-<
-0| class aaa { int bbb; };
+0| class Foo {
 
-[#1 Domain] = 0:0-0:23
-  >-----------------------<
-0| class aaa { int bbb; };
+[#1 Domain] = 0:0-2:1
+  >-----------
+0| class Foo {
+1|     int aaa = 2;
+2| }
+   -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 0:16-0:19
-                  >---<
-0| class aaa { int bbb; };
+[#2 Content] = 1:8-1:11
+          >---<
+1|     int aaa = 2;
 
-[#2 Removal] = 0:15-0:19
-                 >----<
-0| class aaa { int bbb; };
+[#2 Removal] = 1:8-1:12
+          >----<
+1|     int aaa = 2;
 
-[#2 Leading delimiter] = 0:15-0:16
-                 >-<
-0| class aaa { int bbb; };
+[#2 Leading delimiter] = 1:7-1:8
+         >-<
+1|     int aaa = 2;
 
-[#2 Domain] = 0:12-0:20
-              >--------<
-0| class aaa { int bbb; };
+[#2 Trailing delimiter] = 1:11-1:12
+             >-<
+1|     int aaa = 2;
+
+[#2 Domain] = 1:4-1:16
+      >------------<
+1|     int aaa = 2;
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/name.foreach.scope b/data/fixtures/scopes/cpp/name.foreach.scope
@@ -0,0 +1,24 @@
+for (int value : values) {}
+---
+
+[Content] = 0:9-0:14
+           >-----<
+0| for (int value : values) {}
+
+[Removal] = 0:9-0:15
+           >------<
+0| for (int value : values) {}
+
+[Leading delimiter] = 0:8-0:9
+          >-<
+0| for (int value : values) {}
+
+[Trailing delimiter] = 0:14-0:15
+                >-<
+0| for (int value : values) {}
+
+[Domain] = 0:0-0:27
+  >---------------------------<
+0| for (int value : values) {}
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope
@@ -0,0 +1,13 @@
+class MyClass { }
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-0:17
+  >-----------------<
+0| class MyClass { }
+
+
+[#2 Range] =
+[#2 Domain] = 0:15-0:16
+                 >-<
+0| class MyClass { }
diff --git a/data/fixtures/scopes/cpp/type.field.scope b/data/fixtures/scopes/cpp/type.field.scope
@@ -1,33 +1,38 @@
-class aaa { int bbb; };
+class Foo {
+    int aaa = 2;
+}
 ---
 
 [#1 Content] =
 [#1 Removal] =
-[#1 Domain] = 0:0-0:23
-  >-----------------------<
-0| class aaa { int bbb; };
+[#1 Domain] = 0:0-2:1
+  >-----------
+0| class Foo {
+1|     int aaa = 2;
+2| }
+   -<
 
 [#1 Insertion delimiter] = " "
 
 
-[#2 Content] = 0:12-0:15
-              >---<
-0| class aaa { int bbb; };
+[#2 Content] = 1:4-1:7
+      >---<
+1|     int aaa = 2;
 
-[#2 Removal] = 0:12-0:16
-              >----<
-0| class aaa { int bbb; };
+[#2 Removal] = 1:4-1:8
+      >----<
+1|     int aaa = 2;
 
-[#2 Leading delimiter] = 0:11-0:12
-             >-<
-0| class aaa { int bbb; };
+[#2 Leading delimiter] = 1:0-1:4
+  >----<
+1|     int aaa = 2;
 
-[#2 Trailing delimiter] = 0:15-0:16
-                 >-<
-0| class aaa { int bbb; };
+[#2 Trailing delimiter] = 1:7-1:8
+         >-<
+1|     int aaa = 2;
 
-[#2 Domain] = 0:12-0:20
-              >--------<
-0| class aaa { int bbb; };
+[#2 Domain] = 1:4-1:16
+      >------------<
+1|     int aaa = 2;
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/cpp/type.typeArgument.iteration.scope b/data/fixtures/scopes/cpp/type.typeArgument.iteration.scope
@@ -0,0 +1,7 @@
+Map<string, int> foo;
+---
+
+[Range] =
+[Domain] = 0:4-0:15
+      >-----------<
+0| Map<string, int> foo;
diff --git a/data/fixtures/scopes/cpp/type.typeArgument.scope b/data/fixtures/scopes/cpp/type.typeArgument.scope
@@ -0,0 +1,52 @@
+Map<string, int> foo;
+---
+
+[#1 Content] = 0:0-0:16
+  >----------------<
+0| Map<string, int> foo;
+
+[#1 Removal] = 0:0-0:17
+  >-----------------<
+0| Map<string, int> foo;
+
+[#1 Trailing delimiter] = 0:16-0:17
+                  >-<
+0| Map<string, int> foo;
+
+[#1 Domain] = 0:0-0:21
+  >---------------------<
+0| Map<string, int> foo;
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Domain] = 0:4-0:10
+      >------<
+0| Map<string, int> foo;
+
+[#2 Removal] = 0:4-0:12
+      >--------<
+0| Map<string, int> foo;
+
+[#2 Trailing delimiter] = 0:10-0:12
+            >--<
+0| Map<string, int> foo;
+
+[#2 Insertion delimiter] = ", "
+
+
+[#3 Content] =
+[#3 Domain] = 0:12-0:15
+              >---<
+0| Map<string, int> foo;
+
+[#3 Removal] = 0:10-0:15
+            >-----<
+0| Map<string, int> foo;
+
+[#3 Leading delimiter] = 0:10-0:12
+            >--<
+0| Map<string, int> foo;
+
+[#3 Insertion delimiter] = ", "
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/value.argument.formal.constructor.iteration.scope
@@ -3,7 +3,16 @@ class MyClass {
 }
 ---
 
-[Range] =
-[Domain] = 1:12-1:32
+[#1 Range] =
+[#1 Domain] = 0:15-2:0
+                 >
+0| class MyClass {
+1|     MyClass(int aaa, int bbb = 2) {}
+2| }
+   <
+
+
+[#2 Range] =
+[#2 Domain] = 1:12-1:32
               >--------------------<
 1|     MyClass(int aaa, int bbb = 2) {}
diff --git a/data/fixtures/scopes/cpp/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/value.argument.formal.method.iteration.scope
@@ -3,7 +3,16 @@ class MyClass {
 }
 ---
 
-[Range] =
-[Domain] = 1:13-1:33
+[#1 Range] =
+[#1 Domain] = 0:15-2:0
+                 >
+0| class MyClass {
+1|     void foo(int aaa, int bbb = 2) {}
+2| }
+   <
+
+
+[#2 Range] =
+[#2 Domain] = 1:13-1:33
                >--------------------<
 1|     void foo(int aaa, int bbb = 2) {}
diff --git a/data/fixtures/scopes/cpp/value.field.scope b/data/fixtures/scopes/cpp/value.field.scope
diff --git a/data/fixtures/scopes/cpp/value.foreach.scope b/data/fixtures/scopes/cpp/value.foreach.scope
diff --git a/queries/c.scm b/queries/c.scm
diff --git a/queries/cpp.scm b/queries/cpp.scm
