Snippet wrap

.eslintrc.json

@@ -21,5 +21,9 @@
         ],
         "no-throw-literal": "warn",
         "semi": "off"
-    }
+    },
+    "ignorePatterns": [
+        "**/vendor/**/*.ts",
+        "**/vendor/**/*.js"
+    ]
 }

.vscode/launch.json

@@ -36,6 +36,25 @@
 				"${workspaceFolder}/out/test/**/*.js"
 			],
 			"preLaunchTask": "${defaultBuildTask}"
+		},
+		{
+			"name": "Update fixtures",
+			"type": "extensionHost",
+			"request": "launch",
+			"env": {
+				"CURSORLESS_TEST": "true",
+				"CURSORLESS_TEST_UPDATE_FIXTURES": "true",
+			},
+			"args": [
+				"--disable-extension",
+				"asvetliakov.vscode-neovim",
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+			],
+			"outFiles": [
+				"${workspaceFolder}/out/test/**/*.js"
+			],
+			"preLaunchTask": "${defaultBuildTask}"
 		}
 	]
 }

package.json

@@ -400,6 +400,138 @@
 							"verticalOffset": 0
 						}
 					}
+				},
+				"cursorless.experimental.snippets": {
+					"description": "Snippets for use in cursorless",
+					"type": "object",
+					"default": {
+						"ifStatement": {
+							"definitions": [],
+							"defaultScopeTypes": {
+								"consequence": "statement"
+							},
+							"description": "If statement"
+						},
+						"tryCatchStatement": {
+							"definitions": [],
+							"defaultScopeTypes": {
+								"body": "statement",
+								"exceptBody": "statement"
+							},
+							"description": "Try catch statement"
+						},
+						"ifElseStatement": {
+							"definitions": [],
+							"defaultScopeTypes": {
+								"consequence": "statement",
+								"alternative": "statement"
+							},
+							"description": "If else statement"
+						}
+					},
+					"additionalProperties": {
+						"type": "object",
+						"properties": {
+							"definitions": {
+								"type": "array",
+								"items": {
+									"type": "object",
+									"properties": {
+										"scope": {
+											"type": "object",
+											"desription": "Scopes where this snippet is active",
+											"properties": {
+												"langIds": {
+													"type": "array",
+													"items": {
+														"type": "string"
+													}
+												},
+												"scopeType": {
+													"type": "string",
+													"enum": [
+														"argumentOrParameter",
+														"anonymousFunction",
+														"attribute",
+														"class",
+														"className",
+														"collectionItem",
+														"collectionKey",
+														"comment",
+														"functionCall",
+														"functionName",
+														"ifStatement",
+														"list",
+														"map",
+														"name",
+														"namedFunction",
+														"regularExpression",
+														"statement",
+														"string",
+														"type",
+														"value",
+														"xmlBothTags",
+														"xmlElement",
+														"xmlEndTag",
+														"xmlStartTag"
+													]
+												}
+											}
+										},
+										"body": {
+											"type": "array",
+											"items": {
+												"type": "string"
+											},
+											"description": "Inline snippet text; entries joined by newline"
+										}
+									},
+									"required": [
+										"body"
+									]
+								}
+							},
+							"defaultScopeTypes": {
+								"type": "object",
+								"additionalProperties": {
+									"type": "string",
+									"enum": [
+										"argumentOrParameter",
+										"anonymousFunction",
+										"attribute",
+										"class",
+										"className",
+										"collectionItem",
+										"collectionKey",
+										"comment",
+										"functionCall",
+										"functionName",
+										"ifStatement",
+										"list",
+										"map",
+										"name",
+										"namedFunction",
+										"regularExpression",
+										"statement",
+										"string",
+										"type",
+										"value",
+										"xmlBothTags",
+										"xmlElement",
+										"xmlEndTag",
+										"xmlStartTag"
+									]
+								}
+							},
+							"description": {
+								"type": "string",
+								"description": "Description of the snippet"
+							}
+						},
+						"required": [
+							"definitions"
+						]
+					}
 				}
 			}
 		}
@@ -432,7 +564,7 @@
 		"js-yaml": "^4.1.0",
 		"mocha": "^8.1.3",
 		"sinon": "^11.1.1",
-		"typescript": "^4.1.2",
+		"typescript": "^4.4.4",
 		"vscode-test": "^1.4.1"
 	},
 	"dependencies": {

src/actions/BringMoveSwap.ts

@@ -31,7 +31,7 @@ interface MarkEntry {
 }
 
 class BringMoveSwap implements Action {
-  targetPreferences: ActionPreferences[] = [
+  getTargetPreferences: () => ActionPreferences[] = () => [
     { insideOutsideType: null },
     { insideOutsideType: null },
   ];

src/actions/Call.ts

@@ -8,7 +8,7 @@ import {
 import { ensureSingleTarget } from "../util/targetUtils";
 
 export default class Call implements Action {
-  targetPreferences: ActionPreferences[] = [
+  getTargetPreferences: () => ActionPreferences[] = () => [
     { insideOutsideType: "inside" },
     { insideOutsideType: "inside" },
   ];

src/actions/Clear.ts

@@ -9,7 +9,7 @@ import { ensureSingleEditor } from "../util/targetUtils";
 import { setSelectionsAndFocusEditor } from "../util/setSelectionsAndFocusEditor";
 
 export default class Clear implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/CommandAction.ts

@@ -18,7 +18,7 @@ import { callFunctionAndUpdateSelections } from "../util/updateSelections";
 import { ensureSingleEditor } from "../util/targetUtils";
 
 export default class CommandAction implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
   private ensureSingleEditor: boolean;
 
   constructor(

src/actions/CopyLines.ts

@@ -14,7 +14,7 @@ import unifyRanges from "../util/unifyRanges";
 import expandToContainingLine from "../util/expandToContainingLine";
 
 class CopyLines implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph, private isUp: boolean) {
     this.run = this.run.bind(this);

src/actions/CutCopyPaste.ts

@@ -12,7 +12,7 @@ import { getOutsideOverflow } from "../util/targetUtils";
 import { zip } from "lodash";
 
 export class Cut implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: null }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: null }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Delete.ts

@@ -11,7 +11,7 @@ import { flatten } from "lodash";
 import { performEditsAndUpdateSelections } from "../util/updateSelections";
 
 export default class Delete implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "outside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "outside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/EditNewLine.ts

@@ -8,7 +8,7 @@ import {
 import { commands, Selection } from "vscode";
 
 class EditNewLine implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph, private isAbove: boolean) {
     this.run = this.run.bind(this);

src/actions/ExtractVariable.ts

@@ -9,7 +9,7 @@ import { ensureSingleTarget } from "../util/targetUtils";
 import { commands } from "vscode";
 
 export default class ExtractVariable implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Find.ts

@@ -9,7 +9,7 @@ import { commands } from "vscode";
 import { ensureSingleTarget } from "../util/targetUtils";
 
 export class FindInFiles implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Fold.ts

@@ -9,7 +9,7 @@ import {
 import { ensureSingleEditor } from "../util/targetUtils";
 
 class FoldAction implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "outside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "outside" }];
 
   constructor(private command: string) {
     this.run = this.run.bind(this);

src/actions/GetText.ts

@@ -9,7 +9,7 @@ import displayPendingEditDecorations from "../util/editDisplayUtils";
 import { ensureSingleTarget } from "../util/targetUtils";
 
 export default class GetText implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/InsertEmptyLines.ts

@@ -12,7 +12,7 @@ import { performEditsAndUpdateSelections } from "../util/updateSelections";
 import { flatten } from "lodash";
 
 class InsertEmptyLines implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(
     private graph: Graph,

src/actions/Replace.ts

@@ -14,7 +14,7 @@ import { performEditsAndUpdateSelections } from "../util/updateSelections";
 type RangeGenerator = { start: number };
 
 export default class implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: null }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: null }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Scroll.ts

@@ -11,7 +11,7 @@ import { commands, window, workspace } from "vscode";
 import { focusEditor } from "../util/setSelectionsAndFocusEditor";
 
 class Scroll implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph, private at: string) {
     this.run = this.run.bind(this);

src/actions/SetBreakpoint.ts

@@ -25,7 +25,7 @@ function getBreakpoints(uri: Uri, range: Range) {
 }
 
 export default class SetBreakpoint implements Action {
-  targetPreferences: ActionPreferences[] = [
+  getTargetPreferences: () => ActionPreferences[] = () => [
     { insideOutsideType: "inside", selectionType: "line" },
   ];
 

src/actions/SetSelection.ts

@@ -10,7 +10,7 @@ import { Selection } from "vscode";
 import { setSelectionsAndFocusEditor } from "../util/setSelectionsAndFocusEditor";
 
 export class SetSelection implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Sort.ts

@@ -7,7 +7,7 @@ import {
 } from "../typings/Types";
 
 export class Sort implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [{ insideOutsideType: "inside" }];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);

src/actions/Wrap.ts

@@ -14,7 +14,9 @@ import { performEditsAndUpdateSelections } from "../util/updateSelections";
 import { selectionWithEditorFromPositions } from "../util/selectionUtils";
 
 export default class Wrap implements Action {
-  targetPreferences: ActionPreferences[] = [{ insideOutsideType: "inside" }];
+  getTargetPreferences: () => ActionPreferences[] = () => [
+    { insideOutsideType: "inside" },
+  ];
 
   constructor(private graph: Graph) {
     this.run = this.run.bind(this);