Revert "Merge pull request #15612 from rebornix/MarginHighlight"

This reverts commit ddae048, reversing
changes made to e55b563.

src/vs/editor/browser/view/viewImpl.ts

@@ -25,7 +25,6 @@ import { ContentViewOverlays, MarginViewOverlays } from 'vs/editor/browser/view/
 import { LayoutProvider } from 'vs/editor/browser/viewLayout/layoutProvider';
 import { ViewContentWidgets } from 'vs/editor/browser/viewParts/contentWidgets/contentWidgets';
 import { CurrentLineHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight';
-import { CurrentLineMarginHighlightOverlay } from 'vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight';
 import { DecorationsOverlay } from 'vs/editor/browser/viewParts/decorations/decorations';
 import { GlyphMarginOverlay } from 'vs/editor/browser/viewParts/glyphMargin/glyphMargin';
 import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers';
@@ -239,7 +238,6 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp
 
 		let marginViewOverlays = new MarginViewOverlays(this._context, this.layoutProvider);
 		this.viewParts.push(marginViewOverlays);
-		marginViewOverlays.addDynamicOverlay(new CurrentLineMarginHighlightOverlay(this._context, this.layoutProvider));
 		marginViewOverlays.addDynamicOverlay(new GlyphMarginOverlay(this._context));
 		marginViewOverlays.addDynamicOverlay(new MarginViewLineDecorationsOverlay(this._context));
 		marginViewOverlays.addDynamicOverlay(new LinesDecorationsOverlay(this._context));

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

@@ -16,7 +16,7 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
 	private _context: ViewContext;
 	private _lineHeight: number;
 	private _readOnly: boolean;
-	private _renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
+	private _renderLineHighlight: boolean;
 	private _layoutProvider: ILayoutProvider;
 	private _selectionIsEmpty: boolean;
 	private _primaryCursorIsInEditableRange: boolean;
@@ -134,8 +134,6 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
 	}
 
 	private _shouldShowCurrentLine(): boolean {
-		return (this._renderLineHighlight === 'line' || this._renderLineHighlight === 'all') &&
-			this._selectionIsEmpty &&
-			this._primaryCursorIsInEditableRange;
+		return this._renderLineHighlight && this._selectionIsEmpty && this._primaryCursorIsInEditableRange;
 	}
 }

src/vs/editor/common/config/commonEditorConfig.ts

@@ -277,14 +277,6 @@ class InternalEditorOptionsHelper {
 			renderWhitespace = 'none';
 		}
 
-		let renderLineHighlight = opts.renderLineHighlight;
-		// Compatibility with old true or false values
-		if (<any>renderLineHighlight === true) {
-			renderLineHighlight = 'line';
-		} else if (<any>renderLineHighlight === false) {
-			renderLineHighlight = 'none';
-		}
-
 		let viewInfo = new editorCommon.InternalEditorViewOptions({
 			theme: opts.theme,
 			canUseTranslate3d: canUseTranslate3d,
@@ -309,7 +301,7 @@ class InternalEditorOptionsHelper {
 			renderWhitespace: renderWhitespace,
 			renderControlCharacters: toBoolean(opts.renderControlCharacters),
 			renderIndentGuides: toBoolean(opts.renderIndentGuides),
-			renderLineHighlight: renderLineHighlight,
+			renderLineHighlight: toBoolean(opts.renderLineHighlight),
 			scrollbar: scrollbar,
 			fixedOverflowWidgets: toBoolean(opts.fixedOverflowWidgets)
 		});
@@ -860,10 +852,9 @@ let editorConfiguration: IConfigurationNode = {
 			description: nls.localize('renderIndentGuides', "Controls whether the editor should render indent guides")
 		},
 		'editor.renderLineHighlight': {
-			'type': 'string',
-			'enum': ['none', 'gutter', 'line', 'all'],
+			'type': 'boolean',
 			default: DefaultConfig.editor.renderLineHighlight,
-			description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight, posibilties are 'none', 'gutter', 'line', and 'all'.")
+			description: nls.localize('renderLineHighlight', "Controls whether the editor should render the current line highlight")
 		},
 		'editor.codeLens': {
 			'type': 'boolean',

src/vs/editor/common/config/defaultConfig.ts

@@ -98,7 +98,7 @@ class ConfigClass implements IConfiguration {
 			renderWhitespace: 'none',
 			renderControlCharacters: false,
 			renderIndentGuides: false,
-			renderLineHighlight: 'all',
+			renderLineHighlight: true,
 			useTabStops: true,
 
 			fontFamily: (

src/vs/editor/common/editorCommon.ts

@@ -466,9 +466,9 @@ export interface IEditorOptions {
 	renderIndentGuides?: boolean;
 	/**
 	 * Enable rendering of current line highlight.
-	 * Defaults to all.
+	 * Defaults to true.
 	 */
-	renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all';
+	renderLineHighlight?: boolean;
 	/**
 	 * Inserting and deleting whitespace follows tab stops.
 	 */
@@ -669,7 +669,7 @@ export class InternalEditorViewOptions {
 	readonly renderWhitespace: 'none' | 'boundary' | 'all';
 	readonly renderControlCharacters: boolean;
 	readonly renderIndentGuides: boolean;
-	readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
+	readonly renderLineHighlight: boolean;
 	readonly scrollbar: InternalEditorScrollbarOptions;
 	readonly fixedOverflowWidgets: boolean;
 
@@ -700,7 +700,7 @@ export class InternalEditorViewOptions {
 		renderWhitespace: 'none' | 'boundary' | 'all';
 		renderControlCharacters: boolean;
 		renderIndentGuides: boolean;
-		renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
+		renderLineHighlight: boolean;
 		scrollbar: InternalEditorScrollbarOptions;
 		fixedOverflowWidgets: boolean;
 	}) {
@@ -727,7 +727,7 @@ export class InternalEditorViewOptions {
 		this.renderWhitespace = source.renderWhitespace;
 		this.renderControlCharacters = Boolean(source.renderControlCharacters);
 		this.renderIndentGuides = Boolean(source.renderIndentGuides);
-		this.renderLineHighlight = source.renderLineHighlight;
+		this.renderLineHighlight = Boolean(source.renderLineHighlight);
 		this.scrollbar = source.scrollbar.clone();
 		this.fixedOverflowWidgets = Boolean(source.fixedOverflowWidgets);
 	}

src/vs/monaco.d.ts

@@ -1322,9 +1322,9 @@ declare module monaco.editor {
         renderIndentGuides?: boolean;
         /**
          * Enable rendering of current line highlight.
-         * Defaults to all.
+         * Defaults to true.
          */
-        renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all';
+        renderLineHighlight?: boolean;
         /**
          * Inserting and deleting whitespace follows tab stops.
          */
@@ -1424,7 +1424,7 @@ declare module monaco.editor {
         readonly renderWhitespace: 'none' | 'boundary' | 'all';
         readonly renderControlCharacters: boolean;
         readonly renderIndentGuides: boolean;
-        readonly renderLineHighlight: 'none' | 'gutter' | 'line' | 'all';
+        readonly renderLineHighlight: boolean;
         readonly scrollbar: InternalEditorScrollbarOptions;
         readonly fixedOverflowWidgets: boolean;
     }

src/vs/workbench/parts/debug/electron-browser/repl.ts

@@ -269,7 +269,7 @@ export class Repl extends Panel implements IPrivateReplService {
 			lineDecorationsWidth: 0,
 			scrollBeyondLastLine: false,
 			theme: this.themeService.getColorTheme(),
-			renderLineHighlight: 'none',
+			renderLineHighlight: false,
 			fixedOverflowWidgets: true,
 			acceptSuggestionOnEnter: false
 		};

src/vs/workbench/parts/output/browser/outputPanel.ts

@@ -90,7 +90,7 @@ export class OutputPanel extends StringEditor {
 		options.rulers = [];
 		options.folding = false;
 		options.scrollBeyondLastLine = false;
-		options.renderLineHighlight = 'none';
+		options.renderLineHighlight = false;
 
 		const channel = this.outputService.getActiveChannel();
 		options.ariaLabel = channel ? nls.localize('outputPanelWithInputAriaLabel', "{0}, Output panel", channel.label) : nls.localize('outputPanelAriaLabel', "Output panel");