Push back Escape handling to get rid of BaseHoverWidget.hide()

alexdima · alexdima · commit 8f8081132515 · 2020-05-14T21:11:42.000+02:00
diff --git a/src/vs/base/browser/ui/hover/baseHoverWidget.ts b/src/vs/base/browser/ui/hover/baseHoverWidget.ts
@@ -8,8 +8,6 @@ import * as dom from 'vs/base/browser/dom';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
-import { KeyCode } from 'vs/base/common/keyCodes';
-import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 
 const $ = dom.$;
 
@@ -32,12 +30,6 @@ export abstract class BaseHoverWidget extends Widget {
 		this._scrollbar = new DomScrollableElement(this._domNode, {});
 		this._register(this._scrollbar);
 		this._containerDomNode.appendChild(this._scrollbar.getDomNode());
-
-		this.onkeydown(this._containerDomNode, (e: IKeyboardEvent) => {
-			if (e.equals(KeyCode.Escape)) {
-				this.hide();
-			}
-		});
 	}
 
 	protected _onContentsChange(): void {
@@ -60,6 +52,4 @@ export abstract class BaseHoverWidget extends Widget {
 			actionOptions.run(actionContainer);
 		});
 	}
-
-	protected abstract hide(): void;
 }
diff --git a/src/vs/editor/contrib/hover/hoverWidgets.ts b/src/vs/editor/contrib/hover/hoverWidgets.ts
@@ -4,7 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
+import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Widget } from 'vs/base/browser/ui/widget';
+import { KeyCode } from 'vs/base/common/keyCodes';
 import { IContentWidget, ICodeEditor, IContentWidgetPosition, ContentWidgetPositionPreference, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Position } from 'vs/editor/common/core/position';
@@ -46,6 +48,12 @@ export class ContentHoverWidget extends BaseHoverWidget implements IContentWidge
 		this._isVisible = false;
 		this._stoleFocus = false;
 
+		this.onkeydown(this._containerDomNode, (e: IKeyboardEvent) => {
+			if (e.equals(KeyCode.Escape)) {
+				this.hide();
+			}
+		});
+
 		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
 			if (e.hasChanged(EditorOption.fontInfo)) {
 				this.updateFont();
diff --git a/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts b/src/vs/workbench/contrib/terminal/browser/widgets/hoverWidget.ts
@@ -12,6 +12,7 @@ import { editorHoverHighlight, editorHoverBackground, editorHoverBorder, textLin
 import * as dom from 'vs/base/browser/dom';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IHoverTarget, HorizontalAnchorSide, VerticalAnchorSide } from 'vs/workbench/contrib/terminal/browser/widgets/widgets';
+import { KeyCode } from 'vs/base/common/keyCodes';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { EDITOR_FONT_DEFAULTS, IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { BaseHoverWidget } from 'vs/base/browser/ui/hover/baseHoverWidget';
@@ -46,6 +47,13 @@ export class HoverWidget extends BaseHoverWidget {
 		// not be selected.
 		this.onmousedown(this._containerDomNode, e => e.stopPropagation());
 
+		// Hide hover on escape
+		this.onkeydown(this._containerDomNode, e => {
+			if (e.equals(KeyCode.Escape)) {
+				this.dispose();
+			}
+		});
+
 		const rowElement = $('div.hover-row.markdown-hover');
 		const contentsElement = $('div.hover-contents');
 		const markdownElement = renderMarkdown(this._text, {
