Merge branch 'main' into forcedSnippetLanguage

AndreasArvidsson · AndreasArvidsson · commit d09e93c703d6 · 2025-02-06T07:09:52.000+01:00
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -18,14 +18,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          # This is needed to get the number of commits in the current branch
           fetch-depth: 0
 
-      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
-      - name: Upgrade Corepack
-        run: npm install --global corepack@0.31.0
-
-      - name: Enable Corepack
-        run: corepack enable
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -70,8 +67,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Enable Corepack
-        run: corepack enable
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/pr-description.yaml b/.github/workflows/pr-description.yaml
@@ -10,8 +10,8 @@ jobs:
   validate-pr-description:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up workspace
-        uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
       - name: Validate description
         run: |
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -27,12 +27,8 @@ jobs:
         with:
           python-version: 3.x
 
-      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
-      - name: Upgrade Corepack
-        run: npm install --global corepack@0.31.0
-
-      - name: Enable Corepack
-        run: corepack enable
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/test-docs.yml b/.github/workflows/test-docs.yml
@@ -16,12 +16,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
-      - name: Upgrade Corepack
-        run: npm install --global corepack@0.31.0
-
-      - name: Enable Corepack
-        run: corepack enable
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,12 +37,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # FIXME: https://github.com/cursorless-dev/cursorless/issues/2817
-      - name: Upgrade Corepack
-        run: npm install --global --force corepack@0.31.0
-
-      - name: Enable Corepack
-        run: corepack enable
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
diff --git a/cursorless-talon/src/fallback.py b/cursorless-talon/src/fallback.py
@@ -19,6 +19,7 @@
     "remove": actions.edit.delete,
     "editNewLineBefore": actions.edit.line_insert_up,
     "editNewLineAfter": actions.edit.line_insert_down,
+    "insertCopyAfter": actions.edit.line_clone,
 }
 
 modifier_callbacks = {
diff --git a/cursorless-talon/src/spoken_forms.json b/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",
@@ -46,7 +50,7 @@
       "scout all": "findInWorkspace",
       "scout": "findInDocument",
       "shuffle": "randomizeTargets",
-      "snippet make": "generateSnippet",
+      "snip make": "generateSnippet",
       "sort": "sortTargets",
       "take": "setSelection",
       "type deaf": "revealTypeDefinition",
@@ -62,7 +66,7 @@
     },
     "swap_action": { "swap": "swapTargets" },
     "wrap_action": { "wrap": "wrapWithPairedDelimiter", "repack": "rewrap" },
-    "insert_snippet_action": { "snippet": "insertSnippet" },
+    "insert_snippet_action": { "snip": "insertSnippet" },
     "reformat_action": { "format": "applyFormatter" },
     "call_action": { "call": "callAsFunction" }
   },
diff --git a/packages/common/src/ide/fake/FakeCapabilities.ts b/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,
   };
 }
diff --git a/packages/common/src/ide/types/CommandId.ts b/packages/common/src/ide/types/CommandId.ts
@@ -14,4 +14,8 @@ export type CommandId =
   | "showHover"
   | "showDebugHover"
   | "extractVariable"
-  | "insertLineAfter";
+  | "insertLineAfter"
+  | "gitAccept"
+  | "gitRevert"
+  | "gitStage"
+  | "gitUnstage";
diff --git a/packages/common/src/types/TextEditor.ts b/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>;
 }
diff --git a/packages/common/src/types/command/ActionDescriptor.ts b/packages/common/src/types/command/ActionDescriptor.ts
@@ -27,6 +27,10 @@ export const simpleActionNames = [
   "foldRegion",
   "followLink",
   "followLinkAside",
+  "gitAccept",
+  "gitRevert",
+  "gitStage",
+  "gitUnstage",
   "increment",
   "indentLine",
   "insertCopyAfter",
diff --git a/packages/cursorless-engine/src/CommandHistory.ts b/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":
diff --git a/packages/cursorless-engine/src/actions/Actions.ts b/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");
 }
diff --git a/packages/cursorless-engine/src/actions/SimpleIdeCommandActions.ts b/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":
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/CollectionItemScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/CollectionItemScopeHandler/CollectionItemScopeHandler.ts
@@ -6,7 +6,7 @@ import type {
 } from "@cursorless/common";
 import type { LanguageDefinitions } from "../../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "../BaseScopeHandler";
-import { OneOfScopeHandler } from "../OneOfScopeHandler";
+import { SortedScopeHandler } from "../SortedScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
   ComplexScopeType,
@@ -46,7 +46,7 @@ export class CollectionItemScopeHandler extends BaseScopeHandler {
         return textualScopeHandler;
       }
 
-      return OneOfScopeHandler.createFromScopeHandlers(
+      return SortedScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
         languageId,
         [languageScopeHandler, textualScopeHandler],
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotebookCellScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/NotebookCellScopeHandler.ts
@@ -7,7 +7,7 @@ import {
 import type { LanguageDefinitions } from "../../../languages/LanguageDefinitions";
 import { BaseScopeHandler } from "./BaseScopeHandler";
 import { NotebookCellApiScopeHandler } from "./NotebookCellApiScopeHandler";
-import { OneOfScopeHandler } from "./OneOfScopeHandler";
+import { SortedScopeHandler } from "./SortedScopeHandler";
 import type { TargetScope } from "./scope.types";
 import type {
   ComplexScopeType,
@@ -44,7 +44,7 @@ export class NotebookCellScopeHandler extends BaseScopeHandler {
         return apiScopeHandler;
       }
 
-      return OneOfScopeHandler.createFromScopeHandlers(
+      return SortedScopeHandler.createFromScopeHandlers(
         scopeHandlerFactory,
         languageId,
         [languageScopeHandler, apiScopeHandler],
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactoryImpl.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/ScopeHandlerFactoryImpl.ts
@@ -12,7 +12,7 @@ import { FallbackScopeHandler } from "./FallbackScopeHandler";
 import { IdentifierScopeHandler } from "./IdentifierScopeHandler";
 import { LineScopeHandler } from "./LineScopeHandler";
 import { NotebookCellScopeHandler } from "./NotebookCellScopeHandler";
-import { OneOfScopeHandler } from "./OneOfScopeHandler";
+import { SortedScopeHandler } from "./SortedScopeHandler";
 import { ParagraphScopeHandler } from "./ParagraphScopeHandler";
 import {
   CustomRegexScopeHandler,
@@ -130,7 +130,7 @@ export class ScopeHandlerFactoryImpl implements ScopeHandlerFactory {
       case "custom":
         return scopeType.scopeHandler;
       case "oneOf":
-        return OneOfScopeHandler.create(this, scopeType, languageId);
+        return SortedScopeHandler.create(this, scopeType, languageId);
       case "fallback":
         return FallbackScopeHandler.create(this, scopeType, languageId);
       case "conditional":
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SortedScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SortedScopeHandler.ts
@@ -15,10 +15,10 @@ import type {
   ScopeIteratorRequirements,
 } from "./scopeHandler.types";
 
-export class OneOfScopeHandler extends BaseScopeHandler {
+export class SortedScopeHandler extends BaseScopeHandler {
   protected isHierarchical = true;
   public scopeType = undefined;
-  private iterationScopeHandler: OneOfScopeHandler | undefined;
+  private iterationScopeHandler: SortedScopeHandler | undefined;
   private lastYieldedIndex: number | undefined;
 
   static create(
@@ -43,7 +43,7 @@ export class OneOfScopeHandler extends BaseScopeHandler {
     scopeHandlers: ScopeHandler[],
   ): ScopeHandler {
     const getIterationScopeHandler = () =>
-      new OneOfScopeHandler(
+      new SortedScopeHandler(
         scopeHandlers.map((scopeHandler) =>
           scopeHandlerFactory.create(
             scopeHandler.iterationScopeType,
@@ -55,12 +55,12 @@ export class OneOfScopeHandler extends BaseScopeHandler {
         },
       );
 
-    return new OneOfScopeHandler(scopeHandlers, getIterationScopeHandler);
+    return new SortedScopeHandler(scopeHandlers, getIterationScopeHandler);
   }
 
   private constructor(
     private scopeHandlers: ScopeHandler[],
-    private getIterationScopeHandler: () => OneOfScopeHandler,
+    private getIterationScopeHandler: () => SortedScopeHandler,
   ) {
     super();
   }
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/InteriorScopeHandler.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/SurroundingPairScopeHandler/InteriorScopeHandler.ts
@@ -12,7 +12,7 @@ import type { Target } from "../../../../typings/target.types";
 import { InteriorTarget } from "../../../targets";
 import { BaseScopeHandler } from "../BaseScopeHandler";
 import { FallbackScopeHandler } from "../FallbackScopeHandler";
-import { OneOfScopeHandler } from "../OneOfScopeHandler";
+import { SortedScopeHandler } from "../SortedScopeHandler";
 import type { TargetScope } from "../scope.types";
 import type {
   ComplexScopeType,
@@ -98,7 +98,7 @@ export class InteriorScopeHandler extends BaseScopeHandler {
       return pairScopeHandler;
     }
 
-    return OneOfScopeHandler.createFromScopeHandlers(
+    return SortedScopeHandler.createFromScopeHandlers(
       this.scopeHandlerFactory,
       this.languageId,
       [languageScopeHandler, pairScopeHandler],
diff --git a/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/index.ts b/packages/cursorless-engine/src/processTargets/modifiers/scopeHandlers/index.ts
@@ -6,7 +6,7 @@ export * from "./WordScopeHandler/WordScopeHandler";
 export * from "./TokenScopeHandler";
 export * from "./DocumentScopeHandler";
 export * from "./TreeSitterScopeHandler";
-export * from "./OneOfScopeHandler";
+export * from "./SortedScopeHandler";
 export * from "./ParagraphScopeHandler";
 export * from "./SentenceScopeHandler/SentenceScopeHandler";
 export * from "./RegexScopeHandler";
diff --git a/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts b/packages/cursorless-engine/src/spokenForms/defaultSpokenFormMapCore.ts
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/TalonJsCapabilities.ts b/packages/cursorless-everywhere-talon-core/src/ide/TalonJsCapabilities.ts
diff --git a/packages/cursorless-everywhere-talon-core/src/ide/TalonJsEditor.ts b/packages/cursorless-everywhere-talon-core/src/ide/TalonJsEditor.ts
diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeCapabilities.ts
diff --git a/packages/cursorless-vscode/src/ide/vscode/VscodeTextEditorImpl.ts b/packages/cursorless-vscode/src/ide/vscode/VscodeTextEditorImpl.ts
diff --git a/packages/neovim-common/src/ide/neovim/NeovimCapabilities.ts b/packages/neovim-common/src/ide/neovim/NeovimCapabilities.ts
diff --git a/packages/neovim-common/src/ide/neovim/NeovimTextEditorImpl.ts b/packages/neovim-common/src/ide/neovim/NeovimTextEditorImpl.ts

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"remove": actions.edit.delete,`
`20`	`20`	`"editNewLineBefore": actions.edit.line_insert_up,`
`21`	`21`	`"editNewLineAfter": actions.edit.line_insert_down,`
	`22`	`+ "insertCopyAfter": actions.edit.line_clone,`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`modifier_callbacks = {`