Implement Typescript "funk" using queries (#1516)

- Fixes #711 - Fixes #1365 - Fixes #1238 ## Checklist - [x] Make sure that `"name"` behaves as well as `"funk name"` now does - [x] Create PR with migration `"funk name"` => `"name funk"`, and then remove all the `"funk name"` stuff (#1518). Might want to bail on that - [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
cursorless-dev · Jun 16, 2023 · 0fe1b84 · 0fe1b84
1 parent 85a50bb
commit 0fe1b84
Show file tree

Hide file tree

Showing 41 changed files with 1,094 additions and 57 deletions.
diff --git a/packages/cursorless-engine/src/languages/typescript.ts b/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]"],
@@ -226,59 +225,6 @@ const nodeMatchers: Partial<
     "export_statement?.abstract_class_declaration", // export abstract class | abstract class
     "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(
-      patternFinder("abstract_method_signature"),
-      extendForwardPastOptional(";"),
-    ),
-  ),
   type: cascadingMatcher(
     // Typed parameters, properties, and functions
     typeMatcher(),

diff --git a/...ages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearFunk.yml b/...ages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearFunk.yml
@@ -0,0 +1,28 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    class Aaa {
+        bbb = () => {};
+    }
+  selections:
+    - anchor: {line: 1, character: 19}
+      active: {line: 1, character: 19}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+        
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
diff --git a/...ages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName.yml b/...ages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName.yml
@@ -0,0 +1,22 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const aaa = "bbb";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: const  = "bbb";
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName2.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName2.yml
@@ -0,0 +1,22 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export const aaa = "bbb";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: export const  = "bbb";
+  selections:
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 13}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName3.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName3.yml
@@ -0,0 +1,22 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: var aaa = "bbb";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: var  = "bbb";
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName4.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName4.yml
@@ -0,0 +1,22 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export var aaa = "bbb";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: export var  = "bbb";
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName5.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName5.yml
@@ -0,0 +1,24 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: const aaa = "bbb", ccc = "ddd";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: const  = "bbb",  = "ddd";
+  selections:
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 6}
+    - anchor: {line: 0, character: 16}
+      active: {line: 0, character: 16}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName6.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName6.yml
@@ -0,0 +1,24 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: export const aaa = "bbb", ccc = "ddd";
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks: {}
+finalState:
+  documentContents: export const  = "bbb",  = "ddd";
+  selections:
+    - anchor: {line: 0, character: 13}
+      active: {line: 0, character: 13}
+    - anchor: {line: 0, character: 23}
+      active: {line: 0, character: 23}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName7.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName7.yml
@@ -0,0 +1,28 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    class Aaa {
+        bbb = "ccc";
+    }
+  selections:
+    - anchor: {line: 1, character: 16}
+      active: {line: 1, character: 16}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+         = "ccc";
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
diff --git a/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName8.yml b/...ges/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/javascript/clearName8.yml
@@ -0,0 +1,28 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear name
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: name}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |-
+    class Aaa {
+        bbb = "ccc"
+    }
+  selections:
+    - anchor: {line: 1, character: 15}
+      active: {line: 1, character: 15}
+  marks: {}
+finalState:
+  documentContents: |-
+    class Aaa {
+         = "ccc"
+    }
+  selections:
+    - anchor: {line: 1, character: 4}
+      active: {line: 1, character: 4}
diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk10.yml b/...es/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}
diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk11.yml b/...es/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}
diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk12.yml b/...es/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}
diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk13.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/typescript/clearFunk13.yml
@@ -0,0 +1,22 @@
+languageId: javascript
+command:
+  version: 5
+  spokenForm: clear funk
+  action: {name: clearAndSetSelection}
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: var foo = () => {};
+  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}