Cleanup

Author: matthewjamesadam

src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts

@@ -431,6 +431,8 @@ class Widget {
 				firstLineMinLeft = visibleRange.left;
 			}
 		}
+
+		// Left-align widgets that should appear :before content
 		if (this._affinity === PositionAffinity.LeftOfInjectedText &&
 			this._viewRange.startColumn === 1) {
 			firstLineMinLeft = 0;

src/vs/editor/browser/widget/codeEditorWidget.ts

@@ -1359,12 +1359,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 			const opts = this._resolveDecorationOptions(typeKey, !!decorationOption.hoverMessage);
 			if (decorationOption.hoverMessage) {
 				opts.hoverMessage = decorationOption.hoverMessage;
-
-				if (decorationOption.renderOptions?.before ||
-					decorationOption.renderOptions?.dark?.before ||
-					decorationOption.renderOptions?.light?.before) {
-					opts.hoverMessageBefore = true;
-				}
 			}
 
 			newModelDecorations.push({ range: decorationOption.range, options: opts });

src/vs/editor/common/model.ts

@@ -100,10 +100,6 @@ export interface IModelDecorationOptions {
 	 * Array of MarkdownString to render as the decoration message.
 	 */
 	hoverMessage?: IMarkdownString | IMarkdownString[] | null;
-	/**
-	 * If true, hover message will be left-aligned to the beforecontent on the line
-	 */
-	hoverMessageBefore?: boolean | null;
 	/**
 	 * Should the decoration expand to encompass a whole line.
 	 */

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

@@ -139,8 +139,6 @@ export class ContentHoverController extends Disposable {
 
 		this._hoverOperation.cancel();
 
-		// console.log(`--- HOVER CHANGE s-line: ${anchor.range.startLineNumber}  s-col: ${anchor.range.startColumn}  e-line: ${anchor.range.endLineNumber}  e-col: ${anchor.range.endColumn}`);
-
 		if (this._widget.position) {
 			// The range might have changed, but the hover is visible
 			// Instead of hiding it completely, filter out messages that are still in the new range and
@@ -227,7 +225,7 @@ export class ContentHoverController extends Disposable {
 			}
 		}
 
-		const isBefore = messages.some(m => m.isBeforeContent);
+		const isBeforeContent = messages.some(m => m.isBeforeContent);
 
 		if (statusBar.hasContent) {
 			fragment.appendChild(statusBar.hoverElement);
@@ -261,7 +259,7 @@ export class ContentHoverController extends Disposable {
 				showAtRange,
 				this._editor.getOption(EditorOption.hover).above,
 				this._computer.shouldFocus,
-				isBefore,
+				isBeforeContent,
 				disposables
 			));
 		} else {
@@ -309,7 +307,7 @@ class ContentHoverVisibleData {
 		public readonly showAtRange: Range,
 		public readonly preferAbove: boolean,
 		public readonly stoleFocus: boolean,
-		public readonly isBefore: boolean,
+		public readonly isBeforeContent: boolean,
 		public readonly disposables: DisposableStore
 	) { }
 }
@@ -380,7 +378,8 @@ export class ContentHoverWidget extends Disposable implements IContentWidget {
 			preferAbove = true;
 		}
 
-		const affinity = this._visibleData.isBefore ? PositionAffinity.LeftOfInjectedText : undefined;
+		// :before content can align left of the text content
+		const affinity = this._visibleData.isBeforeContent ? PositionAffinity.LeftOfInjectedText : undefined;
 
 		return {
 			position: this._visibleData.showAtPosition,

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

@@ -27,6 +27,9 @@ export interface IHoverPart {
 	 */
 	readonly forceShowAtRange?: boolean;
 
+	/**
+	 * If true, the hover item should appear before content
+	 */
 	readonly isBeforeContent?: boolean;
 	/**
 	 * Is this hover part still valid for this new anchor?

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

@@ -93,9 +93,6 @@ export class MarkdownHoverParticipant implements IEditorHoverParticipant<Markdow
 				continue;
 			}
 
-			// if (d.options.hoverMessageBefore) {
-			// 	isBeforeContent = true;
-			// }
 			if (d.options.beforeContentClassName) {
 				isBeforeContent = true;
 			}

src/vs/monaco.d.ts

@@ -1496,10 +1496,6 @@ declare namespace monaco.editor {
 		 * Array of MarkdownString to render as the decoration message.
 		 */
 		hoverMessage?: IMarkdownString | IMarkdownString[] | null;
-		/**
-		 * If true, hover message will be left-aligned to the beforecontent on the line
-		 */
-		hoverMessageBefore?: boolean | null;
 		/**
 		 * Should the decoration expand to encompass a whole line.
 		 */