Add more scope facets

data/fixtures/recorded/queryBasedMatchers/clearCoreEveryClass.yml

@@ -32,8 +32,8 @@ initialState:
             def fff():
                 pass
   selections:
-    - anchor: {line: 8, character: 19}
-      active: {line: 8, character: 19}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
   marks: {}
 finalState:
   documentContents: |

data/fixtures/recorded/queryBasedMatchers/clearEveryClass.yml

@@ -31,8 +31,8 @@ initialState:
             def fff():
                 pass
   selections:
-    - anchor: {line: 8, character: 13}
-      active: {line: 8, character: 13}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
   marks: {}
 finalState:
   documentContents: |+

data/fixtures/recorded/queryBasedMatchers/clearEveryClass2.yml

@@ -31,8 +31,8 @@ initialState:
             def fff():
                 pass
   selections:
-    - anchor: {line: 10, character: 16}
-      active: {line: 10, character: 16}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
   marks: {}
 finalState:
   documentContents: |+

data/fixtures/scopes/c/interior/interior.switchCase.scope

@@ -2,39 +2,33 @@ switch (foo) {
     case 0:
         bar;
         break;
-    case 1: {
-        break;
-    }
     default:
+        bar;
         break;
 }
 ---
 
-[#1 Content] = 1:4-8:14
+[#1 Content] = 1:4-6:14
       >-------
 1|     case 0:
 2|         bar;
 3|         break;
-4|     case 1: {
-5|         break;
-6|     }
-7|     default:
-8|         break;
+4|     default:
+5|         bar;
+6|         break;
    --------------<
 
 [#1 Removal] =
-[#1 Domain] = 0:14-9:0
+[#1 Domain] = 0:14-7:0
                 >
 0| switch (foo) {
 1|     case 0:
 2|         bar;
 3|         break;
-4|     case 1: {
-5|         break;
-6|     }
-7|     default:
-8|         break;
-9| }
+4|     default:
+5|         bar;
+6|         break;
+7| }
    <
 
 [#1 Insertion delimiter] = " "
@@ -57,30 +51,18 @@ switch (foo) {
 [#2 Insertion delimiter] = " "
 
 
-[#3 Content] = 5:8-5:14
-          >------<
-5|         break;
+[#3 Content] = 5:8-6:14
+          >----
+5|         bar;
+6|         break;
+   --------------<
 
 [#3 Removal] =
-[#3 Domain] = 4:13-6:4
-               >
-4|     case 1: {
-5|         break;
-6|     }
-   ----<
-
-[#3 Insertion delimiter] = " "
-
-
-[#4 Content] = 8:8-8:14
-          >------<
-8|         break;
-
-[#4 Removal] =
-[#4 Domain] = 7:12-8:14
+[#3 Domain] = 4:12-6:14
               >
-7|     default:
-8|         break;
+4|     default:
+5|         bar;
+6|         break;
    --------------<
 
-[#4 Insertion delimiter] = " "
+[#3 Insertion delimiter] = " "

data/fixtures/scopes/c/interior/interior.switchCase2.scope

@@ -0,0 +1,40 @@
+switch (foo) {
+    case 0: { }
+    default: { }
+}
+---
+
+[#1 Content] = 1:4-2:16
+      >-----------
+1|     case 0: { }
+2|     default: { }
+   ----------------<
+
+[#1 Removal] =
+[#1 Domain] = 0:14-3:0
+                >
+0| switch (foo) {
+1|     case 0: { }
+2|     default: { }
+3| }
+   <
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 1:13-1:14
+               >-<
+1|     case 0: { }
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] =
+[#3 Domain] = 2:14-2:15
+                >-<
+2|     default: { }
+
+[#3 Insertion delimiter] = " "

data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope

@@ -1,13 +1,13 @@
-void foo(int aaa = 0, int bbb = 1) {}
+void foo(int aaa, int bbb = 1) {}
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:0-0:37
-  >-------------------------------------<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#1 Domain] = 0:0-0:33
+  >---------------------------------<
+0| void foo(int aaa, int bbb = 1) {}
 
 
 [#2 Content] =
-[#2 Domain] = 0:9-0:33
-           >------------------------<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#2 Domain] = 0:9-0:29
+           >--------------------<
+0| void foo(int aaa, int bbb = 1) {}

data/fixtures/scopes/cpp/name/name.argument.formal.lambda.iteration.scope

@@ -1,13 +1,13 @@
-[](int aaa, int bbb) {}
+[](int aaa, int bbb = 0) {}
 ---
 
 [#1 Content] =
-[#1 Domain] = 0:0-0:23
-  >-----------------------<
-0| [](int aaa, int bbb) {}
+[#1 Domain] = 0:0-0:27
+  >---------------------------<
+0| [](int aaa, int bbb = 0) {}
 
 
 [#2 Content] =
-[#2 Domain] = 0:3-0:19
-     >----------------<
-0| [](int aaa, int bbb) {}
+[#2 Domain] = 0:3-0:23
+     >--------------------<
+0| [](int aaa, int bbb = 0) {}

data/fixtures/scopes/cpp/name/name.argument.formal.lambda.scope

@@ -1,39 +1,43 @@
-[](int aaa, int bbb) {}
+[](int aaa, int bbb = 0) {}
 ---
 
 [#1 Content] = 0:7-0:10
          >---<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
 [#1 Removal] = 0:6-0:10
         >----<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
 [#1 Leading delimiter] = 0:6-0:7
         >-<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
 [#1 Domain] = 0:3-0:10
      >-------<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
 [#1 Insertion delimiter] = " "
 
 
 [#2 Content] = 0:16-0:19
                   >---<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
-[#2 Removal] = 0:15-0:19
-                 >----<
-0| [](int aaa, int bbb) {}
+[#2 Removal] = 0:16-0:20
+                  >----<
+0| [](int aaa, int bbb = 0) {}
 
 [#2 Leading delimiter] = 0:15-0:16
                  >-<
-0| [](int aaa, int bbb) {}
+0| [](int aaa, int bbb = 0) {}
 
-[#2 Domain] = 0:12-0:19
-              >-------<
-0| [](int aaa, int bbb) {}
+[#2 Trailing delimiter] = 0:19-0:20
+                     >-<
+0| [](int aaa, int bbb = 0) {}
+
+[#2 Domain] = 0:12-0:23
+              >-----------<
+0| [](int aaa, int bbb = 0) {}
 
 [#2 Insertion delimiter] = " "

data/fixtures/scopes/cpp/name/name.argument.formal.scope

@@ -1,63 +1,59 @@
-void foo(int aaa = 0, int bbb = 1) {}
+void foo(int aaa, int bbb = 0) {}
 ---
 
 [#1 Content] =
 [#1 Removal] = 0:5-0:8
        >---<
-0| void foo(int aaa = 0, int bbb = 1) {}
+0| void foo(int aaa, int bbb = 0) {}
 
 [#1 Leading delimiter] = 0:4-0:5
       >-<
-0| void foo(int aaa = 0, int bbb = 1) {}
+0| void foo(int aaa, int bbb = 0) {}
 
-[#1 Domain] = 0:0-0:37
-  >-------------------------------------<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#1 Domain] = 0:0-0:33
+  >---------------------------------<
+0| void foo(int aaa, int bbb = 0) {}
 
 [#1 Insertion delimiter] = " "
 
 
 [#2 Content] = 0:13-0:16
                >---<
-0| void foo(int aaa = 0, int bbb = 1) {}
+0| void foo(int aaa, int bbb = 0) {}
 
-[#2 Removal] = 0:13-0:17
-               >----<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#2 Removal] = 0:12-0:16
+              >----<
+0| void foo(int aaa, int bbb = 0) {}
 
 [#2 Leading delimiter] = 0:12-0:13
               >-<
-0| void foo(int aaa = 0, int bbb = 1) {}
+0| void foo(int aaa, int bbb = 0) {}
 
-[#2 Trailing delimiter] = 0:16-0:17
-                  >-<
-0| void foo(int aaa = 0, int bbb = 1) {}
-
-[#2 Domain] = 0:9-0:20
-           >-----------<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#2 Domain] = 0:9-0:16
+           >-------<
+0| void foo(int aaa, int bbb = 0) {}
 
 [#2 Insertion delimiter] = " "
 
 
-[#3 Content] = 0:26-0:29
-                            >---<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#3 Content] = 0:22-0:25
+                        >---<
+0| void foo(int aaa, int bbb = 0) {}
 
-[#3 Removal] = 0:26-0:30
-                            >----<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#3 Removal] = 0:22-0:26
+                        >----<
+0| void foo(int aaa, int bbb = 0) {}
 
-[#3 Leading delimiter] = 0:25-0:26
-                           >-<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#3 Leading delimiter] = 0:21-0:22
+                       >-<
+0| void foo(int aaa, int bbb = 0) {}
 
-[#3 Trailing delimiter] = 0:29-0:30
-                               >-<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#3 Trailing delimiter] = 0:25-0:26
+                           >-<
+0| void foo(int aaa, int bbb = 0) {}
 
-[#3 Domain] = 0:22-0:33
-                        >-----------<
-0| void foo(int aaa = 0, int bbb = 1) {}
+[#3 Domain] = 0:18-0:29
+                    >-----------<
+0| void foo(int aaa, int bbb = 0) {}
 
 [#3 Insertion delimiter] = " "

data/fixtures/scopes/cpp/value/value.argument.formal.lambda.iteration.scope

@@ -0,0 +1,13 @@
+[](int aaa = 0, int bbb = 1) {}
+---
+
+[#1 Content] =
+[#1 Domain] = 0:0-0:31
+  >-------------------------------<
+0| [](int aaa = 0, int bbb = 1) {}
+
+
+[#2 Content] =
+[#2 Domain] = 0:3-0:27
+     >------------------------<
+0| [](int aaa = 0, int bbb = 1) {}