define-keybinding widget: escape clears if non-empty, otherwise hides the widget

Author: ulugbekna

src/vs/workbench/contrib/preferences/browser/keybindingWidgets.ts

@@ -177,7 +177,7 @@ export class DefineKeybindingWidget extends Widget {
 		this._keybindingInputWidget.startRecordingKeys();
 		this._register(this._keybindingInputWidget.onKeybinding(keybinding => this.onKeybinding(keybinding)));
 		this._register(this._keybindingInputWidget.onEnter(() => this.hide()));
-		this._register(this._keybindingInputWidget.onEscape(() => this.onCancel()));
+		this._register(this._keybindingInputWidget.onEscape(() => this.clearOrHide()));
 		this._register(this._keybindingInputWidget.onBlur(() => this.onCancel()));
 
 		this._outputNode = dom.append(this._domNode.domNode, dom.$('.output'));
@@ -273,6 +273,17 @@ export class DefineKeybindingWidget extends Widget {
 		this.hide();
 	}
 
+	private clearOrHide(): void {
+		if (this._chords === null) {
+			this.hide();
+		} else {
+			this._chords = null;
+			this._keybindingInputWidget.clear();
+			dom.clearNode(this._outputNode);
+			dom.clearNode(this._showExistingKeybindingsNode);
+		}
+	}
+
 	private hide(): void {
 		this._domNode.setDisplay('none');
 		this._isVisible = false;