Fixes #2110: Add IConfigurationChangedEvent.renderWhitespace

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

@@ -221,17 +221,8 @@ class InternalEditorOptionsHelper {
 
 	public static createConfigurationChangedEvent(prevOpts:EditorCommon.IInternalEditorOptions, newOpts:EditorCommon.IInternalEditorOptions): EditorCommon.IConfigurationChangedEvent {
 		return {
-			layoutInfo: 						(!EditorLayoutProvider.layoutEqual(prevOpts.layoutInfo, newOpts.layoutInfo)),
-			stylingInfo: 					(!this._stylingInfoEqual(prevOpts.stylingInfo, newOpts.stylingInfo)),
-			wrappingInfo:					(!this._wrappingInfoEqual(prevOpts.wrappingInfo, newOpts.wrappingInfo)),
-			indentInfo:						(!this._indentInfoEqual(prevOpts.indentInfo, newOpts.indentInfo)),
-			observedOuterWidth:				(prevOpts.observedOuterWidth !== newOpts.observedOuterWidth),
-			observedOuterHeight:				(prevOpts.observedOuterHeight !== newOpts.observedOuterHeight),
-			lineHeight:						(prevOpts.lineHeight !== newOpts.lineHeight),
-			pageSize:						(prevOpts.pageSize !== newOpts.pageSize),
-			typicalHalfwidthCharacterWidth:	(prevOpts.typicalHalfwidthCharacterWidth !== newOpts.typicalHalfwidthCharacterWidth),
-			typicalFullwidthCharacterWidth:	(prevOpts.typicalFullwidthCharacterWidth !== newOpts.typicalFullwidthCharacterWidth),
-			fontSize:						(prevOpts.fontSize !== newOpts.fontSize),
+			_screenReaderNVDA:				(prevOpts._screenReaderNVDA !== newOpts._screenReaderNVDA),
+
 			lineNumbers:						(prevOpts.lineNumbers !== newOpts.lineNumbers),
 			selectOnLineNumbers:				(prevOpts.selectOnLineNumbers !== newOpts.selectOnLineNumbers),
 			glyphMargin:						(prevOpts.glyphMargin !== newOpts.glyphMargin),
@@ -242,7 +233,6 @@ class InternalEditorOptionsHelper {
 			scrollbar:						(!this._scrollbarOptsEqual(prevOpts.scrollbar, newOpts.scrollbar)),
 			overviewRulerLanes:				(prevOpts.overviewRulerLanes !== newOpts.overviewRulerLanes),
 			cursorBlinking:					(prevOpts.cursorBlinking !== newOpts.cursorBlinking),
-			_screenReaderNVDA:				(prevOpts._screenReaderNVDA !== newOpts._screenReaderNVDA),
 			cursorStyle:						(prevOpts.cursorStyle !== newOpts.cursorStyle),
 			fontLigatures:					(prevOpts.fontLigatures !== newOpts.fontLigatures),
 			hideCursorInOverviewRuler:		(prevOpts.hideCursorInOverviewRuler !== newOpts.hideCursorInOverviewRuler),
@@ -256,6 +246,7 @@ class InternalEditorOptionsHelper {
 			stopRenderingLineAfter:			(prevOpts.stopRenderingLineAfter !== newOpts.stopRenderingLineAfter),
 			longLineBoundary:				(prevOpts.longLineBoundary !== newOpts.longLineBoundary),
 			forcedTokenizationBoundary:		(prevOpts.forcedTokenizationBoundary !== newOpts.forcedTokenizationBoundary),
+
 			hover:							(prevOpts.hover !== newOpts.hover),
 			contextmenu:						(prevOpts.contextmenu !== newOpts.contextmenu),
 			quickSuggestions:				(prevOpts.quickSuggestions !== newOpts.quickSuggestions),
@@ -266,7 +257,20 @@ class InternalEditorOptionsHelper {
 			suggestOnTriggerCharacters:		(prevOpts.suggestOnTriggerCharacters !== newOpts.suggestOnTriggerCharacters),
 			selectionHighlight:				(prevOpts.selectionHighlight !== newOpts.selectionHighlight),
 			outlineMarkers:					(prevOpts.outlineMarkers !== newOpts.outlineMarkers),
-			referenceInfos:					(prevOpts.referenceInfos !== newOpts.referenceInfos)
+			referenceInfos:					(prevOpts.referenceInfos !== newOpts.referenceInfos),
+			renderWhitespace:				(prevOpts.renderWhitespace !== newOpts.renderWhitespace),
+
+			layoutInfo: 						(!EditorLayoutProvider.layoutEqual(prevOpts.layoutInfo, newOpts.layoutInfo)),
+			stylingInfo: 					(!this._stylingInfoEqual(prevOpts.stylingInfo, newOpts.stylingInfo)),
+			wrappingInfo:					(!this._wrappingInfoEqual(prevOpts.wrappingInfo, newOpts.wrappingInfo)),
+			indentInfo:						(!this._indentInfoEqual(prevOpts.indentInfo, newOpts.indentInfo)),
+			observedOuterWidth:				(prevOpts.observedOuterWidth !== newOpts.observedOuterWidth),
+			observedOuterHeight:				(prevOpts.observedOuterHeight !== newOpts.observedOuterHeight),
+			lineHeight:						(prevOpts.lineHeight !== newOpts.lineHeight),
+			pageSize:						(prevOpts.pageSize !== newOpts.pageSize),
+			typicalHalfwidthCharacterWidth:	(prevOpts.typicalHalfwidthCharacterWidth !== newOpts.typicalHalfwidthCharacterWidth),
+			typicalFullwidthCharacterWidth:	(prevOpts.typicalFullwidthCharacterWidth !== newOpts.typicalFullwidthCharacterWidth),
+			fontSize:						(prevOpts.fontSize !== newOpts.fontSize)
 		};
 	}
 

src/vs/editor/common/editorCommon.ts

@@ -671,51 +671,57 @@ export interface IInternalEditorOptions {
 export interface IConfigurationChangedEvent {
 	_screenReaderNVDA: boolean;
 
-	layoutInfo:boolean;
-	stylingInfo:boolean;
-	wrappingInfo:boolean;
-	indentInfo:boolean;
-	observedOuterWidth:boolean;
-	observedOuterHeight:boolean;
-	lineHeight:boolean;
-	pageSize:boolean;
-	typicalHalfwidthCharacterWidth:boolean;
-	typicalFullwidthCharacterWidth:boolean;
-	fontSize:boolean;
-	lineNumbers:boolean;
-	selectOnLineNumbers:boolean;
-	glyphMargin:boolean;
-	revealHorizontalRightPadding:boolean;
-	roundedSelection:boolean;
-	theme:boolean;
-	readOnly:boolean;
-	scrollbar:boolean;
-	overviewRulerLanes:boolean;
-	cursorBlinking:boolean;
-	cursorStyle:boolean;
-	fontLigatures:boolean;
-	hideCursorInOverviewRuler:boolean;
-	scrollBeyondLastLine:boolean;
-	wrappingIndent:boolean;
+	// ---- Options that are transparent - get no massaging
+	lineNumbers: boolean;
+	selectOnLineNumbers: boolean;
+	glyphMargin: boolean;
+	revealHorizontalRightPadding: boolean;
+	roundedSelection: boolean;
+	theme: boolean;
+	readOnly: boolean;
+	scrollbar: boolean;
+	overviewRulerLanes: boolean;
+	cursorBlinking: boolean;
+	cursorStyle: boolean;
+	fontLigatures: boolean;
+	hideCursorInOverviewRuler: boolean;
+	scrollBeyondLastLine: boolean;
+	wrappingIndent: boolean;
 	wordWrapBreakBeforeCharacters: boolean;
 	wordWrapBreakAfterCharacters: boolean;
 	wordWrapBreakObtrusiveCharacters: boolean;
-	tabFocusMode:boolean;
-	stopLineTokenizationAfter:boolean;
-	stopRenderingLineAfter:boolean;
-	longLineBoundary:boolean;
-	forcedTokenizationBoundary:boolean;
-	hover:boolean;
-	contextmenu:boolean;
-	quickSuggestions:boolean;
-	quickSuggestionsDelay:boolean;
-	iconsInSuggestions:boolean;
-	autoClosingBrackets:boolean;
-	formatOnType:boolean;
-	suggestOnTriggerCharacters:boolean;
-	selectionHighlight:boolean;
+	tabFocusMode: boolean;
+	stopLineTokenizationAfter: boolean;
+	stopRenderingLineAfter: boolean;
+	longLineBoundary: boolean;
+	forcedTokenizationBoundary: boolean;
+
+	// ---- Options that are transparent - get no massaging
+	hover: boolean;
+	contextmenu: boolean;
+	quickSuggestions: boolean;
+	quickSuggestionsDelay: boolean;
+	iconsInSuggestions: boolean;
+	autoClosingBrackets: boolean;
+	formatOnType: boolean;
+	suggestOnTriggerCharacters: boolean;
+	selectionHighlight: boolean;
 	outlineMarkers: boolean;
 	referenceInfos: boolean;
+	renderWhitespace: boolean;
+
+	// ---- Options that are computed
+	layoutInfo: boolean;
+	stylingInfo: boolean;
+	wrappingInfo: boolean;
+	indentInfo: boolean;
+	observedOuterWidth: boolean;
+	observedOuterHeight: boolean;
+	lineHeight: boolean;
+	pageSize: boolean;
+	typicalHalfwidthCharacterWidth: boolean;
+	typicalFullwidthCharacterWidth: boolean;
+	fontSize: boolean;
 }
 
 /**