Refactoring the code (microsoft#210483)

refactoring the code

Author: aiday-mar

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

@@ -12,7 +12,6 @@ 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 { HoverStartMode, HoverStartSource } from 'vs/editor/contrib/hover/browser/hoverOperation';
-import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHover';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
 import { InlineSuggestionHintsContentWidget } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget';
@@ -22,6 +21,7 @@ import { RunOnceScheduler } from 'vs/base/common/async';
 import { ContentHoverWidget } from 'vs/editor/contrib/hover/browser/contentHoverWidget';
 import { ContentHoverController } from 'vs/editor/contrib/hover/browser/contentHoverController';
 import 'vs/css!./hover';
+import { MarginHoverWidget } from 'vs/editor/contrib/hover/browser/marginHoverWidget';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false

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

@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { asArray } from 'vs/base/common/arrays';
+import { IMarkdownString, isEmptyMarkdownString } from 'vs/base/common/htmlContent';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { IHoverComputer } from 'vs/editor/contrib/hover/browser/hoverOperation';
+import { GlyphMarginLane } from 'vs/editor/common/model';
+
+export type LaneOrLineNumber = GlyphMarginLane | 'lineNo';
+
+export interface IHoverMessage {
+	value: IMarkdownString;
+}
+
+export class MarginHoverComputer implements IHoverComputer<IHoverMessage> {
+
+	private _lineNumber: number = -1;
+	private _laneOrLine: LaneOrLineNumber = GlyphMarginLane.Center;
+
+	public get lineNumber(): number {
+		return this._lineNumber;
+	}
+
+	public set lineNumber(value: number) {
+		this._lineNumber = value;
+	}
+
+	public get lane(): LaneOrLineNumber {
+		return this._laneOrLine;
+	}
+
+	public set lane(value: LaneOrLineNumber) {
+		this._laneOrLine = value;
+	}
+
+	constructor(
+		private readonly _editor: ICodeEditor
+	) {
+	}
+
+	public computeSync(): IHoverMessage[] {
+
+		const toHoverMessage = (contents: IMarkdownString): IHoverMessage => {
+			return {
+				value: contents
+			};
+		};
+
+		const lineDecorations = this._editor.getLineDecorations(this._lineNumber);
+
+		const result: IHoverMessage[] = [];
+		const isLineHover = this._laneOrLine === 'lineNo';
+		if (!lineDecorations) {
+			return result;
+		}
+
+		for (const d of lineDecorations) {
+			const lane = d.options.glyphMargin?.position ?? GlyphMarginLane.Center;
+			if (!isLineHover && lane !== this._laneOrLine) {
+				continue;
+			}
+
+			const hoverMessage = isLineHover ? d.options.lineNumberHoverMessage : d.options.glyphMarginHoverMessage;
+			if (!hoverMessage || isEmptyMarkdownString(hoverMessage)) {
+				continue;
+			}
+
+			result.push(...asArray(hoverMessage).map(toHoverMessage));
+		}
+
+		return result;
+	}
+}

src/vs/editor/contrib/hover/browser/marginHover.ts renamed to src/vs/editor/contrib/hover/browser/marginHoverWidget.ts

@@ -4,27 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
-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, 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';
+import { HoverOperation, HoverStartMode } from 'vs/editor/contrib/hover/browser/hoverOperation';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { HoverWidget } from 'vs/base/browser/ui/hover/hoverWidget';
-import { GlyphMarginLane } from 'vs/editor/common/model';
 import { IHoverWidget } from 'vs/editor/contrib/hover/browser/hoverTypes';
+import { IHoverMessage, LaneOrLineNumber, MarginHoverComputer } from 'vs/editor/contrib/hover/browser/marginHoverComputer';
 
 const $ = dom.$;
 
-export interface IHoverMessage {
-	value: IMarkdownString;
-}
-
-type LaneOrLineNumber = GlyphMarginLane | 'lineNo';
-
 export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHoverWidget {
 
 	public static readonly ID = 'editor.contrib.modesGlyphHoverWidget';
@@ -190,63 +182,3 @@ export class MarginHoverWidget extends Disposable implements IOverlayWidget, IHo
 		this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
 	}
 }
-
-class MarginHoverComputer implements IHoverComputer<IHoverMessage> {
-
-	private _lineNumber: number = -1;
-	private _laneOrLine: LaneOrLineNumber = GlyphMarginLane.Center;
-
-	public get lineNumber(): number {
-		return this._lineNumber;
-	}
-
-	public set lineNumber(value: number) {
-		this._lineNumber = value;
-	}
-
-	public get lane(): LaneOrLineNumber {
-		return this._laneOrLine;
-	}
-
-	public set lane(value: LaneOrLineNumber) {
-		this._laneOrLine = value;
-	}
-
-	constructor(
-		private readonly _editor: ICodeEditor
-	) {
-	}
-
-	public computeSync(): IHoverMessage[] {
-
-		const toHoverMessage = (contents: IMarkdownString): IHoverMessage => {
-			return {
-				value: contents
-			};
-		};
-
-		const lineDecorations = this._editor.getLineDecorations(this._lineNumber);
-
-		const result: IHoverMessage[] = [];
-		const isLineHover = this._laneOrLine === 'lineNo';
-		if (!lineDecorations) {
-			return result;
-		}
-
-		for (const d of lineDecorations) {
-			const lane = d.options.glyphMargin?.position ?? GlyphMarginLane.Center;
-			if (!isLineHover && lane !== this._laneOrLine) {
-				continue;
-			}
-
-			const hoverMessage = isLineHover ? d.options.lineNumberHoverMessage : d.options.glyphMarginHoverMessage;
-			if (!hoverMessage || isEmptyMarkdownString(hoverMessage)) {
-				continue;
-			}
-
-			result.push(...asArray(hoverMessage).map(toHoverMessage));
-		}
-
-		return result;
-	}
-}