Merge pull request #208793 from microsoft/merogge/voice-conflict

fix issue with terminal chat input focus
microsoft · Mar 26, 2024 · 22f3839 · 22f3839
2 parents 38695f1 + 52d0176
commit 22f3839
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts b/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatActions.ts
@@ -100,7 +100,8 @@ registerActiveXtermAction({
 	title: localize2('focusTerminalInput', 'Focus Terminal Input'),
 	keybinding: {
 		primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
-		when: TerminalChatContextKeys.focused,
+		secondary: [KeyMod.CtrlCmd | KeyCode.KeyI],
+		when: ContextKeyExpr.and(TerminalChatContextKeys.focused, CTX_INLINE_CHAT_FOCUSED.toNegated()),
 		weight: KeybindingWeight.WorkbenchContrib,
 	},
 	f1: true,