Added add pre and post

Author: AndreasArvidsson

cursorless-talon/src/spoken_forms.json

@@ -2,10 +2,12 @@
   "NOTE FOR USERS": "Please don't edit this json file; see https://www.cursorless.org/docs/user/customization",
   "actions.csv": {
     "simple_action": {
-      "append": "appendSelection",
+      "add post": "addSelectionAfter",
+      "add pre": "addSelectionBefore",
+      "add": "addSelection",
       "bottom": "scrollToBottom",
-      "break": "breakLine",
       "break point": "toggleLineBreakpoint",
+      "break": "breakLine",
       "carve": "cutToClipboard",
       "center": "scrollToCenter",
       "change": "clearAndSetSelection",
@@ -23,8 +25,8 @@
       "extract": "extractVariable",
       "float": "insertEmptyLineAfter",
       "fold": "foldRegion",
-      "follow": "followLink",
       "follow split": "followLinkAside",
+      "follow": "followLink",
       "give": "deselect",
       "highlight": "highlight",
       "hover": "showHover",
@@ -40,8 +42,8 @@
       "reference": "showReferences",
       "rename": "rename",
       "reverse": "reverseTargets",
-      "scout": "findInDocument",
       "scout all": "findInWorkspace",
+      "scout": "findInDocument",
       "shuffle": "randomizeTargets",
       "snippet make": "generateSnippet",
       "sort": "sortTargets",

packages/common/src/types/command/ActionDescriptor.ts

@@ -8,7 +8,9 @@ import type { DestinationDescriptor } from "./DestinationDescriptor.types";
  * A simple action takes only a single target and no other arguments.
  */
 export const simpleActionNames = [
-  "appendSelection",
+  "addSelection",
+  "addSelectionAfter",
+  "addSelectionBefore",
   "breakLine",
   "clearAndSetSelection",
   "copyToClipboard",
@@ -33,6 +35,9 @@ export const simpleActionNames = [
   "insertEmptyLinesAround",
   "joinLines",
   "outdentLine",
+  "private.getTargets",
+  "private.setKeyboardTarget",
+  "private.showParseTree",
   "randomizeTargets",
   "remove",
   "rename",
@@ -53,9 +58,6 @@ export const simpleActionNames = [
   "toggleLineBreakpoint",
   "toggleLineComment",
   "unfoldRegion",
-  "private.setKeyboardTarget",
-  "private.showParseTree",
-  "private.getTargets",
 ] as const;
 
 const complexActionNames = [

packages/cursorless-engine/src/CommandHistory.ts

@@ -130,7 +130,9 @@ function sanitizeActionInPlace(action: ActionDescriptor): void {
       delete action.options?.commandArgs;
       break;
 
-    case "appendSelection":
+    case "addSelection":
+    case "addSelectionAfter":
+    case "addSelectionBefore":
     case "breakLine":
     case "clearAndSetSelection":
     case "copyToClipboard":

packages/cursorless-engine/src/actions/Actions.ts

@@ -36,7 +36,9 @@ import Replace from "./Replace";
 import Rewrap from "./Rewrap";
 import { ScrollToBottom, ScrollToCenter, ScrollToTop } from "./Scroll";
 import {
-  AppendSelection,
+  AddSelection,
+  AddSelectionAfter,
+  AddSelectionBefore,
   SetSelection,
   SetSelectionAfter,
   SetSelectionBefore,
@@ -74,7 +76,9 @@ export class Actions implements ActionRecord {
     private modifierStageFactory: ModifierStageFactory,
   ) {}
 
-  appendSelection = new AppendSelection();
+  addSelection = new AddSelection();
+  addSelectionBefore = new AddSelectionBefore();
+  addSelectionAfter = new AddSelectionAfter();
   callAsFunction = new Call(this);
   clearAndSetSelection = new Clear(this);
   copyToClipboard = new CopyToClipboard(this, this.rangeUpdater);

packages/cursorless-engine/src/actions/SetSelection.ts

@@ -4,23 +4,23 @@ import type { Target } from "../typings/target.types";
 import { ensureSingleEditor } from "../util/targetUtils";
 import type { SimpleAction, ActionReturnValue } from "./actions.types";
 
-export class SetSelection implements SimpleAction {
-  constructor(private append: boolean = false) {
+abstract class SetSelectionBase implements SimpleAction {
+  constructor(
+    private selectionMode: "set" | "add",
+    private rangeMode: "content" | "before" | "after",
+  ) {
     this.run = this.run.bind(this);
   }
 
-  protected getSelection(target: Target): Selection {
-    return target.contentSelection;
-  }
-
   async run(targets: Target[]): Promise<ActionReturnValue> {
     const editor = ensureSingleEditor(targets);
 
     const targetSelections = targets.map(this.getSelection);
 
-    const selections = this.append
-      ? editor.selections.concat(targetSelections)
-      : targetSelections;
+    const selections =
+      this.selectionMode === "add"
+        ? editor.selections.concat(targetSelections)
+        : targetSelections;
 
     await ide()
       .getEditableTextEditor(editor)
@@ -30,22 +30,54 @@ export class SetSelection implements SimpleAction {
       thatTargets: targets,
     };
   }
+
+  private getSelection(target: Target): Selection {
+    switch (this.rangeMode) {
+      case "content":
+        return target.contentSelection;
+      case "before":
+        return new Selection(
+          target.contentRange.start,
+          target.contentRange.start,
+        );
+      case "after":
+        return new Selection(target.contentRange.end, target.contentRange.end);
+    }
+  }
+}
+
+export class SetSelection extends SetSelectionBase {
+  constructor() {
+    super("set", "content");
+  }
+}
+
+export class SetSelectionBefore extends SetSelectionBase {
+  constructor() {
+    super("set", "before");
+  }
 }
 
-export class SetSelectionBefore extends SetSelection {
-  protected getSelection(target: Target) {
-    return new Selection(target.contentRange.start, target.contentRange.start);
+export class SetSelectionAfter extends SetSelectionBase {
+  constructor() {
+    super("set", "after");
   }
 }
 
-export class SetSelectionAfter extends SetSelection {
-  protected getSelection(target: Target) {
-    return new Selection(target.contentRange.end, target.contentRange.end);
+export class AddSelection extends SetSelectionBase {
+  constructor() {
+    super("add", "content");
+  }
+}
+
+export class AddSelectionBefore extends SetSelectionBase {
+  constructor() {
+    super("add", "before");
   }
 }
 
-export class AppendSelection extends SetSelection {
+export class AddSelectionAfter extends SetSelectionBase {
   constructor() {
-    super(true);
+    super("add", "after");
   }
 }

packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts

@@ -144,7 +144,9 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
 
   customRegex: {},
   action: {
-    appendSelection: "append",
+    addSelection: "add",
+    addSelectionAfter: "add post",
+    addSelectionBefore: "add pre",
     breakLine: "break",
     scrollToBottom: "bottom",
     toggleLineBreakpoint: "break point",

packages/cursorless-org-docs/src/docs/user/README.md

@@ -531,10 +531,12 @@ Despite the name cursorless, some of the most basic commands in cursorless are f
 
 Note that when combined with list targets, `take`/`pre`/`post` commands will result in multiple cursors.
 
+- `"take <TARGET>"`: Selects the given target.
 - `"pre <TARGET>"`: Places the cursor before the given target.
 - `"post <TARGET>"`: Places the cursor after the given target.
-- `"take <TARGET>"`: Selects the given target.
-- `"append <TARGET>"`: Selects the given target without removing existing selections.
+- `"add <TARGET>"`: Selects the given target while preserving removing existing selections.
+- `"add pre <TARGET>"`: Places the cursor before the given target while preserving removing existing selections.
+- `"add post <TARGET>"`: Places the cursor after the given target while preserving removing existing selections.
 - `"give <TARGET>"`: Deselects the given target.
 
 eg: