Merge pull request microsoft#188083 from microsoft/merogge/tabfoc

meganrogge · web-flow · commit 5b60e2eb3721 · 2023-07-17T10:33:39.000-07:00
only apply terminal accessible buffer keybinding when terminal is focused
diff --git a/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts b/src/vs/workbench/contrib/terminalContrib/accessibility/browser/terminal.accessibility.contribution.ts
@@ -92,7 +92,7 @@ registerTerminalAction({
 		{
 			primary: KeyMod.Shift | KeyCode.Tab,
 			weight: KeybindingWeight.WorkbenchContrib,
-			when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(terminalTabFocusModeContextKey, TerminalContextKeys.accessibleBufferFocus.negate()))
+			when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.focus, ContextKeyExpr.or(terminalTabFocusModeContextKey, TerminalContextKeys.accessibleBufferFocus.negate()))
 		}
 	],
 	run: async (c) => {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ registerTerminalAction({`
`92`	`92`	`{`
`93`	`93`	`primary: KeyMod.Shift \| KeyCode.Tab,`
`94`	`94`	`weight: KeybindingWeight.WorkbenchContrib,`
`95`		`- when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, ContextKeyExpr.or(terminalTabFocusModeContextKey, TerminalContextKeys.accessibleBufferFocus.negate()))`
	`95`	`+ when: ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, TerminalContextKeys.focus, ContextKeyExpr.or(terminalTabFocusModeContextKey, TerminalContextKeys.accessibleBufferFocus.negate()))`
`96`	`96`	`}`
`97`	`97`	`],`
`98`	`98`	`run: async (c) => {`