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

Revert "Chat - Keep/Undo actions polish in the multi-file diff editor (#290188)" (#290416)

Browse Source 
This reverts commit 79c1f6ad28.
This commit is contained in:
Ladislau Szomoru
2026-01-26 17:13:23 +01:00
committed by GitHub
parent d4d37b83e0
commit 62efd48134
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions.ts
View File

@@ -411,30 +411,17 @@ export class AcceptAllEditsAction extends ChatEditingEditorAction {
abstract class MultiDiffAcceptDiscardAction extends Action2 {
constructor(private readonly _options: { readonly location: 'title' | 'content'; readonly accept: boolean }) {
constructor(readonly accept: boolean) {
super({
id: _options.location === 'title'
? _options.accept ? 'chatEditing.multidiff.title.acceptAllFiles' : 'chatEditing.multidiff.title.discardAllFiles'
: _options.accept ? 'chatEditing.multidiff.content.acceptAllFiles' : 'chatEditing.multidiff.content.discardAllFiles',
title: _options.location === 'title'
? _options.accept ? localize('accept4', 'Keep All Edits') : localize('discard4', 'Undo All Edits')
: _options.accept ? localize('accept5', 'Keep') : localize('discard5', 'Undo'),
icon: _options.location === 'title'
? _options.accept ? Codicon.check : Codicon.discard
: undefined,
menu: _options.location === 'title'
? {
when: ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME),
id: MenuId.EditorTitle,
order: _options.accept ? -100 : -99,
group: 'navigation',
}
: {
when: ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME),
id: MenuId.MultiDiffEditorContent,
order: _options.accept ? -100 : -99,
group: 'navigation'
}
id: accept ? 'chatEditing.multidiff.acceptAllFiles' : 'chatEditing.multidiff.discardAllFiles',
title: accept ? localize('accept4', 'Keep All Edits') : localize('discard4', 'Undo All Edits'),
icon: accept ? Codicon.check : Codicon.discard,
menu: {
when: ContextKeyExpr.equals('resourceScheme', CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME),
id: MenuId.EditorTitle,
order: accept ? 0 : 1,
group: 'navigation',
},
});
}
@@ -459,7 +446,7 @@ abstract class MultiDiffAcceptDiscardAction extends Action2 {
const { chatSessionResource } = parseChatMultiDiffUri(editor.resource);
const session = chatEditingService.getEditingSession(chatSessionResource);
if (session) {
if (this._options.accept) {
if (this.accept) {
await session.accept();
} else {
await session.reject();
@@ -644,10 +631,8 @@ export function registerChatEditorActions() {
registerAction2(ToggleDiffAction);
registerAction2(ToggleAccessibleDiffViewAction);
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super({ location: 'title', accept: true }); } });
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super({ location: 'title', accept: false }); } });
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super({ location: 'content', accept: true }); } });
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super({ location: 'content', accept: false }); } });
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super(true); } });
registerAction2(class extends MultiDiffAcceptDiscardAction { constructor() { super(false); } });
registerAction2(ExplainMultiDiffAction);
MenuRegistry.appendMenuItem(MenuId.ChatEditingEditorContent, {