Skip to content

Commit b234a54

Browse files
authored
Simplify chat submit keybindings (microsoft#258925)
So we don't have two different commands registered for 'enter' and you only need to override one to customize the keybinding
1 parent b5218eb commit b234a54

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class ChatSubmitAction extends SubmitAction {
155155
static readonly ID = 'workbench.action.chat.submit';
156156

157157
constructor() {
158-
const precondition = ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask);
158+
const menuCondition = ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Ask);
159159

160160
super({
161161
id: ChatSubmitAction.ID,
@@ -168,7 +168,6 @@ export class ChatSubmitAction extends SubmitAction {
168168
icon: Codicon.sendToRemoteAgent,
169169
tooltip: localize('sendToRemoteAgent', "Send to coding agent"),
170170
},
171-
precondition,
172171
keybinding: {
173172
when: ChatContextKeys.inChatInput,
174173
primary: KeyCode.Enter,
@@ -179,14 +178,14 @@ export class ChatSubmitAction extends SubmitAction {
179178
id: MenuId.ChatExecuteSecondary,
180179
group: 'group_1',
181180
order: 1,
182-
when: ContextKeyExpr.and(precondition, ChatContextKeys.lockedToCodingAgent.negate()),
181+
when: ContextKeyExpr.and(menuCondition, ChatContextKeys.lockedToCodingAgent.negate()),
183182
},
184183
{
185184
id: MenuId.ChatExecute,
186185
order: 4,
187186
when: ContextKeyExpr.and(
188187
whenNotInProgressOrPaused,
189-
precondition,
188+
menuCondition,
190189
),
191190
group: 'navigation',
192191
}]
@@ -438,25 +437,19 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
438437
static readonly ID = 'workbench.action.edits.submit';
439438

440439
constructor() {
441-
const precondition = ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask);
440+
const menuCondition = ChatContextKeys.chatModeKind.notEqualsTo(ChatModeKind.Ask);
442441

443442
super({
444443
id: ChatEditingSessionSubmitAction.ID,
445444
title: localize2('edits.submit.label', "Send"),
446445
f1: false,
447446
category: CHAT_CATEGORY,
448447
icon: Codicon.send,
449-
precondition,
450-
keybinding: {
451-
when: ChatContextKeys.inChatInput,
452-
primary: KeyCode.Enter,
453-
weight: KeybindingWeight.EditorContrib
454-
},
455448
menu: [
456449
{
457450
id: MenuId.ChatExecuteSecondary,
458451
group: 'group_1',
459-
when: ContextKeyExpr.and(whenNotInProgressOrPaused, precondition),
452+
when: ContextKeyExpr.and(whenNotInProgressOrPaused, menuCondition),
460453
order: 1
461454
},
462455
{
@@ -467,7 +460,7 @@ export class ChatEditingSessionSubmitAction extends SubmitAction {
467460
ContextKeyExpr.and(ChatContextKeys.isRequestPaused, ChatContextKeys.inputHasText),
468461
ChatContextKeys.requestInProgress.negate(),
469462
),
470-
precondition),
463+
menuCondition),
471464
group: 'navigation',
472465
}]
473466
});

0 commit comments

Comments
 (0)