Added iteration scope for js statements (#2144)

## Checklist

- [x] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [-] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [-] I have not broken the cheatsheet

Author: AndreasArvidsson

packages/common/src/scopeSupportFacets/javascript.ts

@@ -10,12 +10,15 @@ const { supported, notApplicable } = ScopeSupportFacetLevel;
 export const javascriptScopeSupport: LanguageScopeSupportFacetMap = {
   list: supported,
   map: supported,
-  statement: supported,
   ifStatement: supported,
   regularExpression: supported,
   switchStatementSubject: supported,
   fieldAccess: supported,
 
+  statement: supported,
+  "statement.iteration.document": supported,
+  "statement.iteration.block": supported,
+
   class: supported,
   className: supported,
 

packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts

@@ -43,10 +43,6 @@ export const scopeSupportFacetInfos: Record<
     description: "A map/dictionary",
     scopeType: "map",
   },
-  statement: {
-    description: "A statement, eg assignment, for loop, etc",
-    scopeType: "statement",
-  },
   ifStatement: {
     description: "An if statement",
     scopeType: "ifStatement",
@@ -64,6 +60,22 @@ export const scopeSupportFacetInfos: Record<
     scopeType: "private.fieldAccess",
   },
 
+  statement: {
+    description: "A statement, eg assignment, for loop, etc",
+    scopeType: "statement",
+  },
+  "statement.iteration.document": {
+    description: "Iteration scope for statements. The entire document.",
+    scopeType: "statement",
+    isIteration: true,
+  },
+  "statement.iteration.block": {
+    description:
+      "Iteration scope for statements. Statement blocks(body of functions/if statements/for loops/etc).",
+    scopeType: "statement",
+    isIteration: true,
+  },
+
   class: {
     description: "A class in an object-oriented language",
     scopeType: "class",

packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts

@@ -11,12 +11,15 @@ const scopeSupportFacets = [
 
   "list",
   "map",
-  "statement",
   "ifStatement",
   "regularExpression",
   "switchStatementSubject",
   "fieldAccess",
 
+  "statement",
+  "statement.iteration.document",
+  "statement.iteration.block",
+
   "class",
   "className",
   "namedFunction",

packages/common/src/testUtil/getFixturePaths.ts

@@ -32,10 +32,8 @@ export function getRecordedTestPaths() {
   return walkFilesSync(directory)
     .filter((p) => p.endsWith(".yml") || p.endsWith(".yaml"))
     .map((p) => ({
-      name: path
-        .relative(relativeDir, p.substring(0, p.lastIndexOf(".")))
-        .replaceAll("\\", "/"),
       path: p,
+      name: pathToName(relativeDir, p),
     }));
 }
 
@@ -47,8 +45,14 @@ export function getScopeTestPaths() {
     .filter((p) => p.endsWith(".scope"))
     .map((p) => ({
       path: p,
-      name: path.relative(relativeDir, p.substring(0, p.lastIndexOf("."))),
+      name: pathToName(relativeDir, p),
       languageId: path.dirname(path.relative(directory, p)).split(path.sep)[0],
       facet: path.basename(p).match(/([a-zA-Z.]+)\d*\.scope/)![1],
     }));
 }
+
+function pathToName(relativeDir: string, filePath: string) {
+  return path
+    .relative(relativeDir, filePath.substring(0, filePath.lastIndexOf(".")))
+    .replaceAll("\\", "/");
+}

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/statement.iteration.block.scope

@@ -0,0 +1,23 @@
+function foo() {
+
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-2:1
+0| function foo() {
+  >----------------
+1|
+
+2| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 0:16-2:0
+0| function foo() {
+                  >
+1|
+
+2| }
+   <

packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/statement.iteration.document.scope

@@ -0,0 +1,33 @@
+// Start
+
+function foo() {
+
+}
+---
+
+[#1 Range] =
+[#1 Domain] = 0:0-4:1
+0| // Start
+  >--------
+1|
+
+2| function foo() {
+   ----------------
+3|
+
+4| }
+   -<
+
+
+[#2 Range] =
+[#2 Domain] = 2:16-4:0
+0| // Start
+
+1|
+
+2| function foo() {
+                  >
+3|
+
+4| }
+   <

queries/javascript.core.scm

@@ -680,6 +680,13 @@
   (#not-parent-type? @statement export_statement)
 )
 
+(program) @statement.iteration
+
+(statement_block
+  "{" @statement.iteration.start.endOf
+  "}" @statement.iteration.end.startOf
+)
+
 ;;!! foo(name: string) {}
 ;;!      ^^^^^^^^^^^^
 (