Merge branch 'main' into removeSwitchSubject

Author: AndreasArvidsson

.vscode/settings.json

@@ -28,6 +28,11 @@
     ".busted": "lua"
   },
   "files.eol": "\n",
+  "github.copilot.chat.codeGeneration.instructions": [
+    {
+      "file": "./packages/cursorless-org-docs/src/docs/contributing/scope-test-format.md"
+    }
+  ],
   "typescript.enablePromptUseWorkspaceTsdk": true,
   "typescript.tsdk": "node_modules/typescript/lib",
   // Turn off tsc task auto detection since we have the necessary tasks as npm scripts

data/fixtures/scopes/c/argument/argument.actual.iteration.scope

@@ -1,7 +1,7 @@
 foo(aaa, bbb);
 ---
 
-[Range] = 0:4-0:12
+[Content] = 0:4-0:12
       >--------<
 0| foo(aaa, bbb);
 

data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope

@@ -1,7 +1,7 @@
 foo.bar(aaa, bbb);
 ---
 
-[Range] = 0:8-0:16
+[Content] = 0:8-0:16
           >--------<
 0| foo.bar(aaa, bbb);
 

data/fixtures/scopes/c/argument/argument.formal.iteration.scope

@@ -1,7 +1,7 @@
 void foo(int aaa, int bbb) {}
 ---
 
-[Range] = 0:9-0:25
+[Content] = 0:9-0:25
            >----------------<
 0| void foo(int aaa, int bbb) {}
 

data/fixtures/scopes/c/branch/branch.if.iteration.scope

@@ -3,7 +3,7 @@ else if (false) {}
 else {}
 ---
 
-[Range] =
+[Content] =
 [Domain] = 0:0-2:7
   >------------
 0| if (true) {}

data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope

@@ -6,7 +6,7 @@ switch (value) {
 }
 ---
 
-[Range] = 0:16-5:0
+[Content] = 0:16-5:0
                   >
 0| switch (value) {
 1|     case 0:

data/fixtures/scopes/c/branch/branch.ternary.iteration.scope

@@ -1,7 +1,7 @@
 true ? 0 : 1;
 ---
 
-[Range] =
+[Content] =
 [Domain] = 0:0-0:12
   >------------<
 0| true ? 0 : 1;

data/fixtures/scopes/c/class/class.iteration.document.scope

@@ -3,7 +3,7 @@ struct Foo {};
 
 ---
 
-[Range] =
+[Content] =
 [Domain] = 0:0-2:0
   >
 0|

data/fixtures/scopes/c/className.iteration.document.scope

@@ -3,7 +3,7 @@ struct Foo {};
 
 ---
 
-[Range] =
+[Content] =
 [Domain] = 0:0-2:0
   >
 0|

data/fixtures/scopes/c/collectionItem.unenclosed.iteration.scope

@@ -1,7 +1,7 @@
 int foo, bar;
 ---
 
-[Range] = 0:4-0:12
+[Content] = 0:4-0:12
       >--------<
 0| int foo, bar;