From cbc77941d440e57b04e38890162f3bb44c17ee03 Mon Sep 17 00:00:00 2001
From: l0ng-ai <24760907+l0ng-ai@users.noreply.github.com>
Date: Wed, 4 Nov 2026 13:16:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(vcs):=20bind=20Git=20=E2=80=BA=20Add=20to?=
 =?UTF-8?q?=20=E2=8C=A5=E2=8C=98A=20/=20Ctrl+Alt+A=20(#1159)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Git › Add (vcs.addToVcs) had no shortcut in the IntelliJ keymaps. It now uses ⌥⌘A on macOS and Ctrl+Alt+A on Windows/Linux, so it shows next to Add in the Git menus and works from the project view, editor and Commit view. On Windows the diff viewer's Apply Right Side keeps Ctrl+Alt+A while a diff is focused. The VS Code preset lists the action without a shortcut.

Closes #1158
---
 src/platform/keymaps/ideaParity.test.ts  | 3 +++
 src/platform/keymaps/intellij-macos.ts   | 1 +
 src/platform/keymaps/intellij-windows.ts | 1 +
 src/platform/keymaps/vscode-macos.ts     | 1 +
 4 files changed, 6 insertions(+)

diff --git a/src/platform/keymaps/ideaParity.test.ts b/src/platform/keymaps/ideaParity.test.ts
index 31a77539b..6478c9fc2 100644
--- a/src/platform/keymaps/ideaParity.test.ts
+++ b/src/platform/keymaps/ideaParity.test.ts
@@ -21,6 +21,8 @@ describe("IDEA keymap parity", () => {
     ["vcs.branches", [], ["Ctrl+Shift+`"]],
     // Git.CreateNewBranch shares Inline's shortcut.
     ["vcs.newBranch", ["Meta+Alt+N"], ["Ctrl+Alt+N"]],
+    // ChangesView.AddUnversioned; on Windows the diff viewer's Apply Right Side wins while a diff is focused.
+    ["vcs.addToVcs", ["Meta+Alt+A"], ["Ctrl+Alt+A"]],
     ["refactor.inline", ["Meta+Alt+N"], ["Ctrl+Alt+N"]],
     ["debug.resume", ["Meta+Alt+R", "F9"], ["F9"]],
     ["code.quickDefinition", ["Alt+Space", "Meta+Y"], ["Ctrl+Shift+I"]],
@@ -104,5 +106,6 @@ describe("IDEA keymap parity", () => {
     order(km, "find.inFile", "vcs.log.goToRef");
     // Inline (text editor only) wins over New Branch.
     order(km, "vcs.newBranch", "refactor.inline");
+    order(km, "vcs.addToVcs", "diff.applyRightSide");
   });
 });
diff --git a/src/platform/keymaps/intellij-macos.ts b/src/platform/keymaps/intellij-macos.ts
index ac2f47707..1527ac59d 100644
--- a/src/platform/keymaps/intellij-macos.ts
+++ b/src/platform/keymaps/intellij-macos.ts
@@ -296,6 +296,7 @@ export const intellijMacos: Record<string, string[]> = {
   "vcs.showMessageHistory": ["Ctrl+M"],
   "vcs.update": ["Meta+T"],
   "vcs.rollback": ["Meta+Alt+Z"],
+  "vcs.addToVcs": ["Meta+Alt+A"],
   "vcs.showDiff": ["Meta+D"],
   "vcs.nextChange": ["Ctrl+Alt+Shift+Down"],
   "vcs.prevChange": ["Ctrl+Alt+Shift+Up"],
diff --git a/src/platform/keymaps/intellij-windows.ts b/src/platform/keymaps/intellij-windows.ts
index 1d00b9601..0155816f7 100644
--- a/src/platform/keymaps/intellij-windows.ts
+++ b/src/platform/keymaps/intellij-windows.ts
@@ -290,6 +290,7 @@ export const intellijWindows: Record<string, string[]> = {
   "vcs.showMessageHistory": ["Ctrl+M"],
   "vcs.update": ["Ctrl+T"],
   "vcs.rollback": ["Ctrl+Alt+Z"],
+  "vcs.addToVcs": ["Ctrl+Alt+A"],
   "vcs.showDiff": ["Ctrl+D"],
   "vcs.nextChange": ["Ctrl+Alt+Shift+Down"],
   "vcs.prevChange": ["Ctrl+Alt+Shift+Up"],
diff --git a/src/platform/keymaps/vscode-macos.ts b/src/platform/keymaps/vscode-macos.ts
index 1608c8b10..602a4b999 100644
--- a/src/platform/keymaps/vscode-macos.ts
+++ b/src/platform/keymaps/vscode-macos.ts
@@ -291,6 +291,7 @@ export const vscodeMacos: Record<string, string[]> = {
   "vcs.showMessageHistory": [],
   "vcs.update": [],
   "vcs.rollback": [],
+  "vcs.addToVcs": [],
   "vcs.showDiff": [],
   "vcs.nextChange": ["Alt+F5"],
   "vcs.prevChange": ["Alt+Shift+F5"],