Always dispatch to keybinding service when in chord mode in terminal

Tyriar · Tyriar · commit 14cf2b82bf1e · 2020-02-25T13:45:31.000-08:00
Fixes microsoft#91238
diff --git a/src/vs/platform/keybinding/common/abstractKeybindingService.ts b/src/vs/platform/keybinding/common/abstractKeybindingService.ts
@@ -35,6 +35,10 @@ export abstract class AbstractKeybindingService extends Disposable implements IK
 	private _currentChordChecker: IntervalTimer;
 	private _currentChordStatusMessage: IDisposable | null;
 
+	public get inChordMode(): boolean {
+		return !!this._currentChord;
+	}
+
 	constructor(
 		private _contextKeyService: IContextKeyService,
 		protected _commandService: ICommandService,
diff --git a/src/vs/platform/keybinding/common/keybinding.ts b/src/vs/platform/keybinding/common/keybinding.ts
@@ -50,6 +50,8 @@ export const IKeybindingService = createDecorator<IKeybindingService>('keybindin
 export interface IKeybindingService {
 	_serviceBrand: undefined;
 
+	readonly inChordMode: boolean;
+
 	onDidUpdateKeybindings: Event<IKeybindingEvent>;
 
 	/**
diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts
@@ -11,7 +11,10 @@ import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKe
 import { keys } from 'vs/base/common/map';
 
 export interface IResolveResult {
+	/** Whether the resolved keybinding is entering a chord */
 	enterChord: boolean;
+	/** Whether the resolved keybinding is leaving (and executing) a chord */
+	leaveChord: boolean;
 	commandId: string | null;
 	commandArgs: any;
 	bubble: boolean;
@@ -285,6 +288,7 @@ export class KeybindingResolver {
 		if (currentChord === null && result.keypressParts.length > 1 && result.keypressParts[1] !== null) {
 			return {
 				enterChord: true,
+				leaveChord: false,
 				commandId: null,
 				commandArgs: null,
 				bubble: false
@@ -293,6 +297,7 @@ export class KeybindingResolver {
 
 		return {
 			enterChord: false,
+			leaveChord: result.keypressParts.length > 1,
 			commandId: result.command,
 			commandArgs: result.commandArgs,
 			bubble: result.bubble
diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts
@@ -71,6 +71,8 @@ export class MockContextKeyService implements IContextKeyService {
 export class MockKeybindingService implements IKeybindingService {
 	public _serviceBrand: undefined;
 
+	public readonly inChordMode: boolean = false;
+
 	public get onDidUpdateKeybindings(): Event<IKeybindingEvent> {
 		return Event.None;
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -602,8 +602,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 			// Respect chords if the allowChords setting is set and it's not Escape. Escape is
 			// handled specially for Zen Mode's Escape, Escape chord, plus it's important in
 			// terminals generally
-			const allowChords = resolveResult && resolveResult.enterChord && this._configHelper.config.allowChords && event.key !== 'Escape';
-			if (allowChords || resolveResult && this._skipTerminalCommands.some(k => k === resolveResult.commandId)) {
+			const allowChords = resolveResult?.enterChord && this._configHelper.config.allowChords && event.key !== 'Escape';
+			if (this._keybindingService.inChordMode || allowChords || resolveResult && this._skipTerminalCommands.some(k => k === resolveResult.commandId)) {
 				event.preventDefault();
 				return false;
 			}

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ export class MockContextKeyService implements IContextKeyService {`
`71`	`71`	`export class MockKeybindingService implements IKeybindingService {`
`72`	`72`	`public _serviceBrand: undefined;`
`73`	`73`
	`74`	`+ public readonly inChordMode: boolean = false;`
	`75`	`+`
`74`	`76`	`public get onDidUpdateKeybindings(): Event<IKeybindingEvent> {`
`75`	`77`	`return Event.None;`
`76`	`78`	`}`