Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - 💄 show cancel action while generating commit message (#248813)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-05-13 10:56:27 +00:00
committed by GitHub
parent 8922c1937f
commit c1b930aaa3
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
View File

@@ -1327,7 +1327,8 @@ registerAction2(CollapseAllRepositoriesAction);
registerAction2(ExpandAllRepositoriesAction);
const enum SCMInputWidgetCommandId {
CancelAction = 'scm.input.cancelAction'
CancelAction = 'scm.input.cancelAction',
SetupAction = 'scm.input.triggerSetup'
}
const enum SCMInputWidgetStorageKey {
@@ -1337,7 +1338,7 @@ const enum SCMInputWidgetStorageKey {
registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.action.chat.triggerSetupFromSCMInput',
id: SCMInputWidgetCommandId.SetupAction,
title: localize('scmInputGenerateCommitMessage', "Generate Commit Message with Copilot"),
icon: Codicon.sparkle,
f1: false,
@@ -1416,7 +1417,10 @@ class SCMInputWidgetActionRunner extends ActionRunner {
// Save last action
if (this._runningActions.size === 0) {
this.storageService.store(SCMInputWidgetStorageKey.LastActionId, action.id, StorageScope.PROFILE, StorageTarget.USER);
const actionId = action.id === SCMInputWidgetCommandId.SetupAction
? product.defaultChatAgent?.generateCommitMessageCommand ?? action.id
: action.id;
this.storageService.store(SCMInputWidgetStorageKey.LastActionId, actionId, StorageScope.PROFILE, StorageTarget.USER);
}
}
}
@@ -1488,7 +1492,9 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
let primaryAction: IAction | undefined = undefined;
if (actions.length === 1) {
if ((this.actionRunner as SCMInputWidgetActionRunner).runningActions.size !== 0) {
primaryAction = this._cancelAction;
} else if (actions.length === 1) {
primaryAction = actions[0];
} else if (actions.length > 1) {
const lastActionId = this.storageService.get(SCMInputWidgetStorageKey.LastActionId, StorageScope.PROFILE, '');