Refactor the showsOrWillShow code (microsoft#209452)

* refactoring the showsOrWillShow code

* removing useless check, renaming

Author: aiday-mar

src/vs/editor/contrib/hover/browser/hover.ts

@@ -12,15 +12,13 @@ import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution, IScrollEvent } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { ILanguageService } from 'vs/editor/common/languages/language';
 import { GotoDefinitionAtPositionEditorContribution } from 'vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition';
 import { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import { ContentHoverWidget, ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHover';
 import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHover';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
 import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { HoverParticipantRegistry } from 'vs/editor/contrib/hover/browser/hoverTypes';
@@ -49,6 +47,11 @@ interface IHoverState {
 	activatedByDecoratorClick: boolean;
 }
 
+const enum HoverWidgetType {
+	Content,
+	Glyph,
+}
+
 export class HoverController extends Disposable implements IEditorContribution {
 
 	public static readonly ID = 'editor.contrib.hover';
@@ -70,8 +73,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 	constructor(
 		private readonly _editor: ICodeEditor,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IOpenerService private readonly _openerService: IOpenerService,
-		@ILanguageService private readonly _languageService: ILanguageService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
 		super();
@@ -276,23 +277,13 @@ export class HoverController extends Disposable implements IEditorContribution {
 			return;
 		}
 
-		const contentWidget = this._getOrCreateContentWidget();
-
-		if (contentWidget.showsOrWillShow(mouseEvent)) {
-			this._glyphWidget?.hide();
+		const contentHoverShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Content);
+		if (contentHoverShowsOrWillShow) {
 			return;
 		}
 
-		if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN && target.position && target.detail.glyphMarginLane) {
-			this._contentWidget?.hide();
-			const glyphWidget = this._getOrCreateGlyphWidget();
-			glyphWidget.startShowingAt(target.position.lineNumber, target.detail.glyphMarginLane);
-			return;
-		}
-		if (target.type === MouseTargetType.GUTTER_LINE_NUMBERS && target.position) {
-			this._contentWidget?.hide();
-			const glyphWidget = this._getOrCreateGlyphWidget();
-			glyphWidget.startShowingAt(target.position.lineNumber, 'lineNo');
+		const glyphWidgetShowsOrWillShow = this._tryShowHoverWidget(mouseEvent, HoverWidgetType.Glyph);
+		if (glyphWidgetShowsOrWillShow) {
 			return;
 		}
 		if (_sticky) {
@@ -301,6 +292,17 @@ export class HoverController extends Disposable implements IEditorContribution {
 		this._hideWidgets();
 	}
 
+	private _tryShowHoverWidget(mouseEvent: IEditorMouseEvent, hoverWidgetType: HoverWidgetType): boolean {
+		const isContentWidget = hoverWidgetType === HoverWidgetType.Content;
+		const currentWidget = isContentWidget ? this._getOrCreateContentWidget() : this._getOrCreateGlyphWidget();
+		const otherWidget = isContentWidget ? this._getOrCreateGlyphWidget() : this._getOrCreateContentWidget();
+		const showsOrWillShow = currentWidget.showsOrWillShow(mouseEvent);
+		if (showsOrWillShow) {
+			otherWidget.hide();
+		}
+		return showsOrWillShow;
+	}
+
 	private _onKeyDown(e: IKeyboardEvent): void {
 		if (!this._editor.hasModel()) {
 			return;
@@ -357,7 +359,7 @@ export class HoverController extends Disposable implements IEditorContribution {
 
 	private _getOrCreateGlyphWidget(): MarginHoverWidget {
 		if (!this._glyphWidget) {
-			this._glyphWidget = new MarginHoverWidget(this._editor, this._languageService, this._openerService);
+			this._glyphWidget = this._instantiationService.createInstance(MarginHoverWidget, this._editor);
 		}
 		return this._glyphWidget;
 	}

src/vs/editor/contrib/hover/browser/marginHover.ts

@@ -8,7 +8,7 @@ import { asArray } from 'vs/base/common/arrays';
 import { IMarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent';
 import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { MarkdownRenderer } from 'vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer';
-import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from 'vs/editor/browser/editorBrowser';
+import { ICodeEditor, IEditorMouseEvent, IOverlayWidget, IOverlayWidgetPosition, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ILanguageService } from 'vs/editor/common/languages/language';
 import { HoverOperation, HoverStartMode, IHoverComputer } from 'vs/editor/contrib/hover/browser/hoverOperation';
@@ -101,7 +101,20 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget {
 		}
 	}
 
-	public startShowingAt(lineNumber: number, laneOrLine: LaneOrLineNumber): void {
+	public showsOrWillShow(mouseEvent: IEditorMouseEvent): boolean {
+		const target = mouseEvent.target;
+		if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN && target.detail.glyphMarginLane) {
+			this._startShowingAt(target.position.lineNumber, target.detail.glyphMarginLane);
+			return true;
+		}
+		if (target.type === MouseTargetType.GUTTER_LINE_NUMBERS) {
+			this._startShowingAt(target.position.lineNumber, 'lineNo');
+			return true;
+		}
+		return false;
+	}
+
+	private _startShowingAt(lineNumber: number, laneOrLine: LaneOrLineNumber): void {
 		if (this._computer.lineNumber === lineNumber && this._computer.lane === laneOrLine) {
 			// We have to show the widget at the exact same line number as before, so no work is needed
 			return;