Implement more Typescript scope types using queries

packages/cursorless-engine/src/languages/typescript.ts

@@ -175,7 +175,6 @@ const nodeMatchers: Partial<
     patternMatcher("yield_expression.~yield!"),
   ),
   ifStatement: "if_statement",
-  anonymousFunction: ["arrow_function", "function"],
   comment: "comment",
   regularExpression: "regex",
   className: ["class_declaration[name]", "class[name]"],
@@ -227,51 +226,28 @@ const nodeMatchers: Partial<
     "export_statement.class", // export default class
   ],
   functionName: [
-    // function
-    "function_declaration[name]",
-    // generator function
-    "generator_function_declaration[name]",
-    // export default function
-    "function[name]",
     // class method
     "method_definition[name]",
     // abstract class method
     "abstract_method_signature[name]",
     // class arrow method
     "public_field_definition[name].arrow_function",
-    // const foo = function() { }
-    "variable_declarator[name].function",
-    // const foo = () => { }
-    "variable_declarator[name].arrow_function",
     // foo = function() { }
     "assignment_expression[left].function",
     // foo = () => { }
     "assignment_expression[left].arrow_function",
   ],
   namedFunction: cascadingMatcher(
     patternMatcher(
-      // [export] function
-      "export_statement?.function_declaration",
-      // export default function
-      // NB: We require export statement because otherwise it is an anonymous
-      // function
-      "export_statement.function",
-      // export default arrow
-      "export_statement.arrow_function",
       // class method
       "method_definition",
       // class arrow method
       "public_field_definition.arrow_function",
       // [export] const foo = function() { }
-      "export_statement?.lexical_declaration.variable_declarator.function",
-      // [export] const foo = () => { }
-      "export_statement?.lexical_declaration.variable_declarator.arrow_function",
       // foo = function() { }
       "assignment_expression.function",
       // foo = () => { }
       "assignment_expression.arrow_function",
-      // foo = function*() { }
-      "generator_function_declaration",
     ),
     // abstract class method
     matcher(

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk10.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function *bar() {}
+  selections:
+    - anchor: {line: 0, character: 12}
+      active: {line: 0, character: 12}
+  marks: {}
+finalState:
+  documentContents: "const foo = "
+  selections:
+    - anchor: {line: 0, character: 12}
+      active: {line: 0, character: 12}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk11.yml

@@ -0,0 +1,18 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function *bar() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk12.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export default function *() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk4.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export function *aaa() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk5.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (function foo() {})
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk6.yml

@@ -0,0 +1,18 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (function () {})
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk7.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export const myFunk = () => {};
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk8.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function bar() {}
+  selections:
+    - anchor: {line: 0, character: 12}
+      active: {line: 0, character: 12}
+  marks: {}
+finalState:
+  documentContents: "const foo = "
+  selections:
+    - anchor: {line: 0, character: 12}
+      active: {line: 0, character: 12}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk9.yml

@@ -0,0 +1,18 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function bar() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName2.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export function *aaa() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: export function *() {}
+  selections:
+    - anchor: {line: 0, character: 17}
+      active: {line: 0, character: 17}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName3.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (function foo() {})
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: (function () {})
+  selections:
+    - anchor: {line: 0, character: 10}
+      active: {line: 0, character: 10}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName4.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export const myFunk = () => {};
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: export const  = () => {};
+  selections:
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 13}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName5.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function bar() {}
+  selections:
+    - anchor: {line: 0, character: 12}
+      active: {line: 0, character: 12}
+  marks: {}
+finalState:
+  documentContents: const foo = function () {}
+  selections:
+    - anchor: {line: 0, character: 21}
+      active: {line: 0, character: 21}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunkName6.yml

@@ -0,0 +1,18 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear funk name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const foo = function bar() {}
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+thrownError: {name: NoContainingScopeError}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearLambda5.yml

@@ -0,0 +1,22 @@
+languageId: typescript
+command:
+  version: 5
+  spokenForm: clear lambda
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: anonymousFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: (function () {})
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}
+  marks: {}
+finalState:
+  documentContents: ()
+  selections:
+    - anchor: {line: 0, character: 1}
+      active: {line: 0, character: 1}