Added git actions (#2821)

Fixes #2812

## Release notes

Added several new commends for manipulating your local changes with
`git`:

`"git stage <target>"` to stage changes
`"git unstage <target>"` to unstage changes
`"git revert <target>"` to revert changes
`"git accept <target>"` to accept conflicts

(`<target>`s can span multiple lines or even hunks of changes. When
smaller than a line, VS Code will operate on the line containing the
target.)

---------

Co-authored-by: Phil Cohen <[email protected]>

Author: AndreasArvidsson

cursorless-talon/src/spoken_forms.json

@@ -28,6 +28,10 @@
       "fold": "foldRegion",
       "follow split": "followLinkAside",
       "follow": "followLink",
+      "git accept": "gitAccept",
+      "git stage": "gitStage",
+      "git unstage": "gitUnstage",
+      "git revert": "gitRevert",
       "give": "deselect",
       "highlight": "highlight",
       "hover": "showHover",

packages/common/src/ide/fake/FakeCapabilities.ts

@@ -19,5 +19,9 @@ export class FakeCapabilities implements Capabilities {
     unfold: undefined,
     showReferences: undefined,
     insertLineAfter: undefined,
+    gitAccept: undefined,
+    gitRevert: undefined,
+    gitStage: undefined,
+    gitUnstage: undefined,
   };
 }

packages/common/src/ide/types/CommandId.ts

@@ -14,4 +14,8 @@ export type CommandId =
   | "showHover"
   | "showDebugHover"
   | "extractVariable"
-  | "insertLineAfter";
+  | "insertLineAfter"
+  | "gitAccept"
+  | "gitRevert"
+  | "gitStage"
+  | "gitUnstage";

packages/common/src/types/TextEditor.ts

@@ -237,4 +237,28 @@ export interface EditableTextEditor extends TextEditor {
    * @param range A {@link Range range}
    */
   extractVariable(range?: Range): Promise<void>;
+
+  /**
+   * Git accept conflict (use the range to resolve a conflict hunk)
+   * @param range A {@link Range range}
+   */
+  gitAccept(range?: Range): Promise<void>;
+
+  /**
+   * Git revert range
+   * @param range A {@link Range range}
+   */
+  gitRevert(range?: Range): Promise<void>;
+
+  /**
+   * Git stage range
+   * @param range A {@link Range range}
+   */
+  gitStage(range?: Range): Promise<void>;
+
+  /**
+   * Git unstage range
+   * @param range A {@link Range range}
+   */
+  gitUnstage(range?: Range): Promise<void>;
 }

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

@@ -27,6 +27,10 @@ export const simpleActionNames = [
   "foldRegion",
   "followLink",
   "followLinkAside",
+  "gitAccept",
+  "gitRevert",
+  "gitStage",
+  "gitUnstage",
   "increment",
   "indentLine",
   "insertCopyAfter",

packages/cursorless-engine/src/CommandHistory.ts

@@ -160,6 +160,10 @@ function sanitizeActionInPlace(action: ActionDescriptor): void {
     case "followLinkAside":
     case "generateSnippet":
     case "getText":
+    case "gitAccept":
+    case "gitRevert":
+    case "gitStage":
+    case "gitUnstage":
     case "highlight":
     case "increment":
     case "indentLine":

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

@@ -49,6 +49,10 @@ import ShowParseTree from "./ShowParseTree";
 import {
   ExtractVariable,
   Fold,
+  GitAccept,
+  GitRevert,
+  GitStage,
+  GitUnstage,
   Rename,
   RevealDefinition,
   RevealTypeDefinition,
@@ -105,6 +109,10 @@ export class Actions implements ActionRecord {
   followLinkAside = new FollowLink({ openAside: true });
   generateSnippet = new GenerateSnippet(this.snippets);
   getText = new GetText();
+  gitAccept = new GitAccept(this.rangeUpdater);
+  gitRevert = new GitRevert(this.rangeUpdater);
+  gitStage = new GitStage(this.rangeUpdater);
+  gitUnstage = new GitUnstage(this.rangeUpdater);
   highlight = new Highlight();
   increment = new Increment(this);
   indentLine = new IndentLine(this.rangeUpdater);
@@ -154,10 +162,6 @@ export class Actions implements ActionRecord {
   scrollToBottom = new ScrollToBottom();
   scrollToCenter = new ScrollToCenter();
   scrollToTop = new ScrollToTop();
-  ["private.setKeyboardTarget"] = new SetSpecialTarget("keyboard");
-  ["experimental.setInstanceReference"] = new SetSpecialTarget(
-    "instanceReference",
-  );
   setSelection = new SetSelection();
   setSelectionAfter = new SetSelectionAfter();
   setSelectionBefore = new SetSelectionBefore();
@@ -176,6 +180,12 @@ export class Actions implements ActionRecord {
     this.snippets,
     this.modifierStageFactory,
   );
+
+  ["experimental.setInstanceReference"] = new SetSpecialTarget(
+    "instanceReference",
+  );
+
   ["private.showParseTree"] = new ShowParseTree(this.treeSitter);
   ["private.getTargets"] = new GetTargets();
+  ["private.setKeyboardTarget"] = new SetSpecialTarget("keyboard");
 }

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

@@ -128,6 +128,26 @@ export class ExtractVariable extends SimpleIdeCommandAction {
   restoreSelection = false;
 }
 
+export class GitAccept extends SimpleIdeCommandAction {
+  command: CommandId = "gitAccept";
+  ensureSingleTarget = true;
+}
+
+export class GitRevert extends SimpleIdeCommandAction {
+  command: CommandId = "gitRevert";
+  ensureSingleTarget = true;
+}
+
+export class GitStage extends SimpleIdeCommandAction {
+  command: CommandId = "gitStage";
+  ensureSingleTarget = true;
+}
+
+export class GitUnstage extends SimpleIdeCommandAction {
+  command: CommandId = "gitUnstage";
+  ensureSingleTarget = true;
+}
+
 function callback(
   editor: EditableTextEditor,
   ranges: Range[] | undefined,
@@ -167,6 +187,14 @@ function callback(
       return editor.showDebugHover(ranges?.[0]);
     case "extractVariable":
       return editor.extractVariable(ranges?.[0]);
+    case "gitAccept":
+      return editor.gitAccept(ranges?.[0]);
+    case "gitRevert":
+      return editor.gitRevert(ranges?.[0]);
+    case "gitStage":
+      return editor.gitStage(ranges?.[0]);
+    case "gitUnstage":
+      return editor.gitUnstage(ranges?.[0]);
 
     // Unsupported as simple action
     case "highlight":

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

@@ -204,6 +204,10 @@ export const defaultSpokenFormMapCore: DefaultSpokenFormMapDefinition = {
     insertSnippet: "snippet",
     pasteFromClipboard: "paste",
     joinLines: "join",
+    gitAccept: "git accept",
+    gitRevert: "git revert",
+    gitStage: "git stage",
+    gitUnstage: "git unstage",
 
     ["private.showParseTree"]: isPrivate("parse tree"),
     ["experimental.setInstanceReference"]: isDisabledByDefault("from"),

packages/cursorless-everywhere-talon-core/src/ide/TalonJsCapabilities.ts

@@ -18,6 +18,10 @@ const COMMAND_CAPABILITIES: CommandCapabilityMap = {
   insertLineAfter: undefined,
   indentLine: undefined,
   outdentLine: undefined,
+  gitAccept: undefined,
+  gitRevert: undefined,
+  gitStage: undefined,
+  gitUnstage: undefined,
 };
 
 export class TalonJsCapabilities implements Capabilities {