Add additional variable scope facets (#3162)

Author: AndreasArvidsson

data/fixtures/recorded/languages/rust/chuckName.yml

@@ -17,7 +17,7 @@ initialState:
       active: {line: 0, character: 5}
   marks: {}
 finalState:
-  documentContents: "let mut: [i32; 3] = [0; 3];"
+  documentContents: "[0; 3];"
   selections:
-    - anchor: {line: 0, character: 5}
-      active: {line: 0, character: 5}
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

data/fixtures/scopes/c/name/name.constant.scope

@@ -0,0 +1,24 @@
+const int foo = 0;
+---
+
+[Content] = 0:10-0:13
+            >---<
+0| const int foo = 0;
+
+[Removal] = 0:0-0:16
+  >----------------<
+0| const int foo = 0;
+
+[Leading delimiter] = 0:9-0:10
+           >-<
+0| const int foo = 0;
+
+[Trailing delimiter] = 0:13-0:14
+               >-<
+0| const int foo = 0;
+
+[Domain] = 0:0-0:18
+  >------------------<
+0| const int foo = 0;
+
+[Insertion delimiter] = " "

data/fixtures/scopes/c/name/name.field.class.scope

@@ -1,20 +1,45 @@
-struct { int foo; };
+struct foo {
+    int bar;
+};
 ---
 
-[Content] = 0:13-0:16
-               >---<
-0| struct { int foo; };
+[#1 Content] = 0:7-0:10
+         >---<
+0| struct foo {
 
-[Removal] = 0:12-0:16
-              >----<
-0| struct { int foo; };
+[#1 Removal] = 0:7-0:11
+         >----<
+0| struct foo {
 
-[Leading delimiter] = 0:12-0:13
-              >-<
-0| struct { int foo; };
+[#1 Leading delimiter] = 0:6-0:7
+        >-<
+0| struct foo {
 
-[Domain] = 0:9-0:17
-           >--------<
-0| struct { int foo; };
+[#1 Trailing delimiter] = 0:10-0:11
+            >-<
+0| struct foo {
 
-[Insertion delimiter] = " "
+[#1 Domain] = 0:0-2:2
+  >------------
+0| struct foo {
+1|     int bar;
+2| };
+   --<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 1:8-1:11
+          >---<
+1|     int bar;
+
+[#2 Removal] =
+[#2 Domain] = 1:4-1:12
+      >--------<
+1|     int bar;
+
+[#2 Leading delimiter] = 1:7-1:8
+         >-<
+1|     int bar;
+
+[#2 Insertion delimiter] = " "

data/fixtures/scopes/c/name/name.field.class2.scope

@@ -1,20 +1,45 @@
-union { int foo; };
+union foo {
+    int bar;
+};
 ---
 
-[Content] = 0:12-0:15
-              >---<
-0| union { int foo; };
+[#1 Content] = 0:6-0:9
+        >---<
+0| union foo {
 
-[Removal] = 0:11-0:15
-             >----<
-0| union { int foo; };
+[#1 Removal] = 0:6-0:10
+        >----<
+0| union foo {
 
-[Leading delimiter] = 0:11-0:12
-             >-<
-0| union { int foo; };
+[#1 Leading delimiter] = 0:5-0:6
+       >-<
+0| union foo {
 
-[Domain] = 0:8-0:16
-          >--------<
-0| union { int foo; };
+[#1 Trailing delimiter] = 0:9-0:10
+           >-<
+0| union foo {
 
-[Insertion delimiter] = " "
+[#1 Domain] = 0:0-2:2
+  >-----------
+0| union foo {
+1|     int bar;
+2| };
+   --<
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] = 1:8-1:11
+          >---<
+1|     int bar;
+
+[#2 Removal] =
+[#2 Domain] = 1:4-1:12
+      >--------<
+1|     int bar;
+
+[#2 Leading delimiter] = 1:7-1:8
+         >-<
+1|     int bar;
+
+[#2 Insertion delimiter] = " "

data/fixtures/scopes/c/name/name.field.enum.scope

@@ -37,16 +37,12 @@ enum Foo {
       >---<
 1|     bar = 0,
 
-[#2 Removal] = 1:4-1:8
-      >----<
+[#2 Removal] = 1:4-1:10
+      >------<
 1|     bar = 0,
 
-[#2 Leading delimiter] = 1:0-1:4
-  >----<
-1|     bar = 0,
-
-[#2 Trailing delimiter] = 1:7-1:8
-         >-<
+[#2 Trailing delimiter] = 1:7-1:10
+         >---<
 1|     bar = 0,
 
 [#2 Domain] = 1:4-1:11
@@ -60,16 +56,12 @@ enum Foo {
       >---<
 2|     baz = 1,
 
-[#3 Removal] = 2:4-2:8
-      >----<
-2|     baz = 1,
-
-[#3 Leading delimiter] = 2:0-2:4
-  >----<
+[#3 Removal] = 2:4-2:10
+      >------<
 2|     baz = 1,
 
-[#3 Trailing delimiter] = 2:7-2:8
-         >-<
+[#3 Trailing delimiter] = 2:7-2:10
+         >---<
 2|     baz = 1,
 
 [#3 Domain] = 2:4-2:11

…xtures/scopes/c/name/name.variable.scope …s/c/name/name.variable.initialized.scopedata/fixtures/scopes/c/name/name.variable.scope renamed to data/fixtures/scopes/c/name/name.variable.initialized.scope data/fixtures/scopes/c/name/name.variable.scope renamed to data/fixtures/scopes/c/name/name.variable.initialized.scope

@@ -0,0 +1,17 @@
+int foo;
+---
+
+[Content] = 0:4-0:7
+      >---<
+0| int foo;
+
+[Removal] =
+[Domain] = 0:0-0:8
+  >--------<
+0| int foo;
+
+[Leading delimiter] = 0:3-0:4
+     >-<
+0| int foo;
+
+[Insertion delimiter] = " "

data/fixtures/scopes/c/name/name.variable.uninitialized.scope

@@ -0,0 +1,10 @@
+const int foo = 0;
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:18
+  >------------------<
+0| const int foo = 0;
+
+[Insertion delimiter] = "\n"

data/fixtures/scopes/c/statement/statement.constant.scope

@@ -0,0 +1,10 @@
+int foo;
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:0-0:8
+  >--------<
+0| int foo;
+
+[Insertion delimiter] = "\n"