Merge from vscode 8df646d3c5477b02737fc10343fa7cf0cc3f606b

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

@@ -546,6 +546,11 @@ export interface IEditorOptions {
 	 * Defaults to all.
 	 */
 	renderLineHighlight?: 'none' | 'gutter' | 'line' | 'all';
+	/**
+	 * Control if the current line highlight should be rendered only the editor is focused.
+	 * Defaults to false.
+	 */
+	renderLineHighlightOnlyWhenFocus?: boolean;
 	/**
 	 * Inserting and deleting whitespace follows tab stops.
 	 */
@@ -3414,6 +3419,7 @@ export const enum EditorOption {
 	renderIndentGuides,
 	renderFinalNewline,
 	renderLineHighlight,
+	renderLineHighlightOnlyWhenFocus,
 	renderValidationDecorations,
 	renderWhitespace,
 	revealHorizontalRightPadding,
@@ -3856,6 +3862,10 @@ export const EditorOptions = {
 			description: nls.localize('renderLineHighlight', "Controls how the editor should render the current line highlight.")
 		}
 	)),
+	renderLineHighlightOnlyWhenFocus: register(new EditorBooleanOption(
+		EditorOption.renderLineHighlightOnlyWhenFocus, 'renderLineHighlightOnlyWhenFocus', false,
+		{ description: nls.localize('renderLineHighlightOnlyWhenFocus', "Controls if the editor should render the current line highlight only when the editor is focused") }
+	)),
 	renderValidationDecorations: register(new EditorStringEnumOption(
 		EditorOption.renderValidationDecorations, 'renderValidationDecorations',
 		'editable' as 'editable' | 'on' | 'off',

src/vs/editor/common/standalone/standaloneEnums.ts

@@ -245,43 +245,44 @@ export enum EditorOption {
 	renderIndentGuides = 75,
 	renderFinalNewline = 76,
 	renderLineHighlight = 77,
-	renderValidationDecorations = 78,
-	renderWhitespace = 79,
-	revealHorizontalRightPadding = 80,
-	roundedSelection = 81,
-	rulers = 82,
-	scrollbar = 83,
-	scrollBeyondLastColumn = 84,
-	scrollBeyondLastLine = 85,
-	scrollPredominantAxis = 86,
-	selectionClipboard = 87,
-	selectionHighlight = 88,
-	selectOnLineNumbers = 89,
-	showFoldingControls = 90,
-	showUnused = 91,
-	snippetSuggestions = 92,
-	smoothScrolling = 93,
-	stopRenderingLineAfter = 94,
-	suggest = 95,
-	suggestFontSize = 96,
-	suggestLineHeight = 97,
-	suggestOnTriggerCharacters = 98,
-	suggestSelection = 99,
-	tabCompletion = 100,
-	useTabStops = 101,
-	wordSeparators = 102,
-	wordWrap = 103,
-	wordWrapBreakAfterCharacters = 104,
-	wordWrapBreakBeforeCharacters = 105,
-	wordWrapColumn = 106,
-	wordWrapMinified = 107,
-	wrappingIndent = 108,
-	wrappingStrategy = 109,
-	editorClassName = 110,
-	pixelRatio = 111,
-	tabFocusMode = 112,
-	layoutInfo = 113,
-	wrappingInfo = 114
+	renderLineHighlightOnlyWhenFocus = 78,
+	renderValidationDecorations = 79,
+	renderWhitespace = 80,
+	revealHorizontalRightPadding = 81,
+	roundedSelection = 82,
+	rulers = 83,
+	scrollbar = 84,
+	scrollBeyondLastColumn = 85,
+	scrollBeyondLastLine = 86,
+	scrollPredominantAxis = 87,
+	selectionClipboard = 88,
+	selectionHighlight = 89,
+	selectOnLineNumbers = 90,
+	showFoldingControls = 91,
+	showUnused = 92,
+	snippetSuggestions = 93,
+	smoothScrolling = 94,
+	stopRenderingLineAfter = 95,
+	suggest = 96,
+	suggestFontSize = 97,
+	suggestLineHeight = 98,
+	suggestOnTriggerCharacters = 99,
+	suggestSelection = 100,
+	tabCompletion = 101,
+	useTabStops = 102,
+	wordSeparators = 103,
+	wordWrap = 104,
+	wordWrapBreakAfterCharacters = 105,
+	wordWrapBreakBeforeCharacters = 106,
+	wordWrapColumn = 107,
+	wordWrapMinified = 108,
+	wrappingIndent = 109,
+	wrappingStrategy = 110,
+	editorClassName = 111,
+	pixelRatio = 112,
+	tabFocusMode = 113,
+	layoutInfo = 114,
+	wrappingInfo = 115
 }
 
 /**