Added append action

Author: AndreasArvidsson

cursorless-talon/src/spoken_forms.json

@@ -2,6 +2,7 @@
   "NOTE FOR USERS": "Please don't edit this json file; see https://www.cursorless.org/docs/user/customization",
   "actions.csv": {
     "simple_action": {
+      "append": "appendSelection",
       "bottom": "scrollToBottom",
       "break": "breakLine",
       "break point": "toggleLineBreakpoint",

data/fixtures/recorded/actions/appendWhale.yml

@@ -0,0 +1,33 @@
+languageId: plaintext
+command:
+  version: 7
+  spokenForm: append whale
+  action:
+    name: appendSelection
+    target:
+      type: primitive
+      mark: {type: decoratedSymbol, symbolColor: default, character: w}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  marks:
+    default.w:
+      start: {line: 0, character: 6}
+      end: {line: 0, character: 11}
+finalState:
+  documentContents: hello world
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+    - anchor: {line: 0, character: 6}
+      active: {line: 0, character: 11}
+  thatMark:
+    - type: UntypedTarget
+      contentRange:
+        start: {line: 0, character: 6}
+        end: {line: 0, character: 11}
+      isReversed: false
+      hasExplicitRange: false

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

@@ -8,6 +8,7 @@ import type { DestinationDescriptor } from "./DestinationDescriptor.types";
  * A simple action takes only a single target and no other arguments.
  */
 export const simpleActionNames = [
+  "appendSelection",
   "breakLine",
   "clearAndSetSelection",
   "copyToClipboard",

packages/cursorless-engine/src/CommandHistory.ts

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

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

@@ -18,6 +18,7 @@ import GenerateSnippet from "./GenerateSnippet";
 import GetTargets from "./GetTargets";
 import GetText from "./GetText";
 import Highlight from "./Highlight";
+import { IndentLine, OutdentLine } from "./IndentLine";
 import {
   CopyContentAfter as InsertCopyAfter,
   CopyContentBefore as InsertCopyBefore,
@@ -35,13 +36,13 @@ import Replace from "./Replace";
 import Rewrap from "./Rewrap";
 import { ScrollToBottom, ScrollToCenter, ScrollToTop } from "./Scroll";
 import {
+  AppendSelection,
   SetSelection,
   SetSelectionAfter,
   SetSelectionBefore,
 } from "./SetSelection";
 import { SetSpecialTarget } from "./SetSpecialTarget";
 import ShowParseTree from "./ShowParseTree";
-import { IndentLine, OutdentLine } from "./IndentLine";
 import {
   ExtractVariable,
   Fold,
@@ -73,6 +74,7 @@ export class Actions implements ActionRecord {
     private modifierStageFactory: ModifierStageFactory,
   ) {}
 
+  appendSelection = new AppendSelection();
   callAsFunction = new Call(this);
   clearAndSetSelection = new Clear(this);
   copyToClipboard = new CopyToClipboard(this, this.rangeUpdater);

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

@@ -5,18 +5,23 @@ import { ensureSingleEditor } from "../util/targetUtils";
 import type { SimpleAction, ActionReturnValue } from "./actions.types";
 
 export class SetSelection implements SimpleAction {
-  constructor() {
+  constructor(private append: boolean = false) {
     this.run = this.run.bind(this);
   }
 
-  protected getSelection(target: Target) {
+  protected getSelection(target: Target): Selection {
     return target.contentSelection;
   }
 
   async run(targets: Target[]): Promise<ActionReturnValue> {
     const editor = ensureSingleEditor(targets);
 
-    const selections = targets.map(this.getSelection);
+    const targetSelections = targets.map(this.getSelection);
+
+    const selections = this.append
+      ? editor.selections.concat(targetSelections)
+      : targetSelections;
+
     await ide()
       .getEditableTextEditor(editor)
       .setSelections(selections, { focusEditor: true });
@@ -38,3 +43,9 @@ export class SetSelectionAfter extends SetSelection {
     return new Selection(target.contentRange.end, target.contentRange.end);
   }
 }
+
+export class AppendSelection extends SetSelection {
+  constructor() {
+    super(true);
+  }
+}

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

@@ -144,6 +144,7 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
 
   customRegex: {},
   action: {
+    appendSelection: "append",
     breakLine: "break",
     scrollToBottom: "bottom",
     toggleLineBreakpoint: "break point",