Remove IEditorOption.equals

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

@@ -7,6 +7,7 @@ import * as nls from 'vs/nls';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable } from 'vs/base/common/lifecycle';
 import * as objects from 'vs/base/common/objects';
+import * as arrays from 'vs/base/common/arrays';
 import * as platform from 'vs/base/common/platform';
 import { IEditorOptions, editorOptionsRegistry, ValidatedEditorOptions, IEnvironmentalOptions, ComputedEditorOptions, ConfigurationChangedEvent, EDITOR_FONT_DEFAULTS, EditorOptions, EDITOR_MODEL_DEFAULTS, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
@@ -97,11 +98,26 @@ class EditorConfiguration2 {
 		return result;
 	}
 
+	private static _deepEquals<T>(a: T, b: T): boolean {
+		if (typeof a !== 'object' || typeof b !== 'object') {
+			return (a === b);
+		}
+		if (Array.isArray(a) || Array.isArray(b)) {
+			return (Array.isArray(a) && Array.isArray(b) ? arrays.equals(a, b) : false);
+		}
+		for (let key in a) {
+			if (!EditorConfiguration2._deepEquals(a[key], b[key])) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	public static checkEquals(a: ComputedEditorOptions, b: ComputedEditorOptions): ConfigurationChangedEvent | null {
 		const result: boolean[] = [];
 		let somethingChanged = false;
 		for (const editorOption of editorOptionsRegistry) {
-			const changed = !editorOption.equals(a._read(editorOption.id), b._read(editorOption.id));
+			const changed = !EditorConfiguration2._deepEquals(a._read(editorOption.id), b._read(editorOption.id));
 			result[editorOption.id] = changed;
 			if (changed) {
 				somethingChanged = true;

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

@@ -5,8 +5,6 @@
 
 import * as nls from 'vs/nls';
 import * as assert from 'vs/base/common/assert';
-import * as arrays from 'vs/base/common/arrays';
-import * as objects from 'vs/base/common/objects';
 import * as platform from 'vs/base/common/platform';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { FontInfo } from 'vs/editor/common/config/fontInfo';
@@ -1144,10 +1142,6 @@ export interface IEditorOption<K1 extends EditorOption, K2 extends keyof IExtend
 	 * @internal
 	 */
 	compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: T2): T3;
-	/**
-	 * @internal
-	 */
-	equals(a: T3, b: T3): boolean;
 }
 
 /**
@@ -1169,9 +1163,6 @@ abstract class BaseEditorOption<K1 extends EditorOption, K2 extends keyof IExten
 	}
 	public abstract validate(input: IExtendedEditorOptions[K2] | undefined): T2;
 	public abstract compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: T2): T3;
-	public equals(a: T3, b: T3): boolean {
-		return (a === b);
-	}
 }
 
 class EditorBooleanOption<K1 extends EditorOption, K2 extends PossibleKeyName<boolean>> extends BaseEditorOption<K1, K2, boolean> {
@@ -1296,12 +1287,6 @@ class EditorRenderLineNumbersOption<K1 extends EditorOption, K2 extends Possible
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalEditorRenderLineNumbersOptions): InternalEditorRenderLineNumbersOptions {
 		return value;
 	}
-	public equals(a: InternalEditorRenderLineNumbersOptions, b: InternalEditorRenderLineNumbersOptions): boolean {
-		return (
-			a.renderType === b.renderType
-			&& a.renderFn === b.renderFn
-		);
-	}
 }
 
 //#endregion
@@ -1332,15 +1317,6 @@ class EditorMinimap<K1 extends EditorOption, K2 extends PossibleKeyName<IEditorM
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalEditorMinimapOptions): InternalEditorMinimapOptions {
 		return value;
 	}
-	public equals(a: InternalEditorMinimapOptions, b: InternalEditorMinimapOptions): boolean {
-		return (
-			a.enabled === b.enabled
-			&& a.side === b.side
-			&& a.showSlider === b.showSlider
-			&& a.renderCharacters === b.renderCharacters
-			&& a.maxColumn === b.maxColumn
-		);
-	}
 }
 
 //#endregion
@@ -1367,13 +1343,6 @@ class EditorHover<K1 extends EditorOption, K2 extends PossibleKeyName<IEditorHov
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalEditorHoverOptions): InternalEditorHoverOptions {
 		return value;
 	}
-	public equals(a: InternalEditorHoverOptions, b: InternalEditorHoverOptions): boolean {
-		return (
-			a.enabled === b.enabled
-			&& a.delay === b.delay
-			&& a.sticky === b.sticky
-		);
-	}
 }
 
 //#endregion
@@ -1403,22 +1372,6 @@ class EditorQuickSuggestions<K1 extends EditorOption, K2 extends PossibleKeyName
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: ValidQuickSuggestionsOptions): ValidQuickSuggestionsOptions {
 		return value;
 	}
-	public equals(a: ValidQuickSuggestionsOptions, b: ValidQuickSuggestionsOptions): boolean {
-		if (typeof a === 'boolean') {
-			if (typeof b !== 'boolean') {
-				return false;
-			}
-			return a === b;
-		}
-		if (typeof b === 'boolean') {
-			return false;
-		}
-		return (
-			a.comments === b.comments
-			&& a.other === b.other
-			&& a.strings === b.strings
-		);
-	}
 }
 
 //#endregion
@@ -1460,9 +1413,6 @@ class EditorRulers<K1 extends EditorOption, K2 extends PossibleKeyName<number[]>
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: number[]): number[] {
 		return value;
 	}
-	public equals(a: number[], b: number[]): boolean {
-		return arrays.equals(a, b);
-	}
 }
 
 //#endregion
@@ -1593,9 +1543,6 @@ class EditorFontInfo<K1 extends EditorOption, K2 extends PossibleKeyName<undefin
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: undefined): FontInfo {
 		return env.fontInfo;
 	}
-	public equals(a: FontInfo, b: FontInfo): boolean {
-		return a.equals(b);
-	}
 }
 
 //#endregion
@@ -1626,11 +1573,6 @@ class EditorLightbulb<K1 extends EditorOption, K2 extends PossibleKeyName<IEdito
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: ValidEditorLightbulbOptions): ValidEditorLightbulbOptions {
 		return value;
 	}
-	public equals(a: ValidEditorLightbulbOptions, b: ValidEditorLightbulbOptions): boolean {
-		return (
-			a.enabled === b.enabled
-		);
-	}
 }
 
 //#endregion
@@ -1675,21 +1617,6 @@ class EditorScrollbar<K1 extends EditorOption, K2 extends PossibleKeyName<IEdito
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalEditorScrollbarOptions): InternalEditorScrollbarOptions {
 		return value;
 	}
-	public equals(a: InternalEditorScrollbarOptions, b: InternalEditorScrollbarOptions): boolean {
-		return (
-			a.arrowSize === b.arrowSize
-			&& a.vertical === b.vertical
-			&& a.horizontal === b.horizontal
-			&& a.useShadows === b.useShadows
-			&& a.verticalHasArrows === b.verticalHasArrows
-			&& a.horizontalHasArrows === b.horizontalHasArrows
-			&& a.handleMouseWheel === b.handleMouseWheel
-			&& a.horizontalScrollbarSize === b.horizontalScrollbarSize
-			&& a.horizontalSliderSize === b.horizontalSliderSize
-			&& a.verticalScrollbarSize === b.verticalScrollbarSize
-			&& a.verticalSliderSize === b.verticalSliderSize
-		);
-	}
 }
 
 //#endregion
@@ -1737,18 +1664,6 @@ class EditorSuggest<K1 extends EditorOption, K2 extends PossibleKeyName<ISuggest
 			filteredTypes: value.filteredTypes,
 		};
 	}
-	public equals(a: InternalSuggestOptions, b: InternalSuggestOptions): boolean {
-		return (
-			a.filterGraceful === b.filterGraceful
-			&& a.snippets === b.snippets
-			&& a.snippetsPreventQuickSuggestions === b.snippetsPreventQuickSuggestions
-			&& a.localityBonus === b.localityBonus
-			&& a.shareSuggestSelections === b.shareSuggestSelections
-			&& a.showIcons === b.showIcons
-			&& a.maxVisibleSuggestions === b.maxVisibleSuggestions
-			&& objects.equals(a.filteredTypes, b.filteredTypes)
-		);
-	}
 }
 
 //#endregion
@@ -1773,12 +1688,6 @@ class EditorParameterHints<K1 extends EditorOption, K2 extends PossibleKeyName<I
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalParameterHintOptions): InternalParameterHintOptions {
 		return value;
 	}
-	public equals(a: InternalParameterHintOptions, b: InternalParameterHintOptions): boolean {
-		return (
-			a.enabled === b.enabled
-			&& a.cycle === b.cycle
-		);
-	}
 }
 
 //#endregion
@@ -1810,14 +1719,6 @@ class EditorFind<K1 extends EditorOption, K2 extends PossibleKeyName<IEditorFind
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalEditorFindOptions): InternalEditorFindOptions {
 		return value;
 	}
-	public equals(a: InternalEditorFindOptions, b: InternalEditorFindOptions): boolean {
-		return (
-			a.seedSearchStringFromSelection === b.seedSearchStringFromSelection
-			&& a.autoFindInSelection === b.autoFindInSelection
-			&& a.globalFindClipboard === b.globalFindClipboard
-			&& a.addExtraSpaceOnTop === b.addExtraSpaceOnTop
-		);
-	}
 }
 
 //#endregion
@@ -1840,11 +1741,6 @@ class EditorGoToLocation<K1 extends EditorOption, K2 extends PossibleKeyName<IGo
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions, value: InternalGoToLocationOptions): InternalGoToLocationOptions {
 		return value;
 	}
-	public equals(a: InternalGoToLocationOptions, b: InternalGoToLocationOptions): boolean {
-		return (
-			a.multiple === b.multiple
-		);
-	}
 }
 
 //#endregion
@@ -2022,40 +1918,6 @@ export class EditorLayoutInfoComputer<K1 extends EditorOption, K2 extends Possib
 			pixelRatio: env.pixelRatio
 		});
 	}
-	public equals(a: EditorLayoutInfo, b: EditorLayoutInfo): boolean {
-		return (
-			a.width === b.width
-			&& a.height === b.height
-			&& a.glyphMarginLeft === b.glyphMarginLeft
-			&& a.glyphMarginWidth === b.glyphMarginWidth
-			&& a.glyphMarginHeight === b.glyphMarginHeight
-			&& a.lineNumbersLeft === b.lineNumbersLeft
-			&& a.lineNumbersWidth === b.lineNumbersWidth
-			&& a.lineNumbersHeight === b.lineNumbersHeight
-			&& a.decorationsLeft === b.decorationsLeft
-			&& a.decorationsWidth === b.decorationsWidth
-			&& a.decorationsHeight === b.decorationsHeight
-			&& a.contentLeft === b.contentLeft
-			&& a.contentWidth === b.contentWidth
-			&& a.contentHeight === b.contentHeight
-			&& a.renderMinimap === b.renderMinimap
-			&& a.minimapLeft === b.minimapLeft
-			&& a.minimapWidth === b.minimapWidth
-			&& a.viewportColumn === b.viewportColumn
-			&& a.verticalScrollbarWidth === b.verticalScrollbarWidth
-			&& a.horizontalScrollbarHeight === b.horizontalScrollbarHeight
-			&& EditorLayoutInfoComputer._equalsOverviewRuler(a.overviewRuler, b.overviewRuler)
-		);
-	}
-
-	private static _equalsOverviewRuler(a: OverviewRulerPosition, b: OverviewRulerPosition): boolean {
-		return (
-			a.width === b.width
-			&& a.height === b.height
-			&& a.top === b.top
-			&& a.right === b.right
-		);
-	}
 
 	public static compute(_opts: IEditorLayoutProviderOpts): EditorLayoutInfo {
 		const outerWidth = _opts.outerWidth | 0;
@@ -2265,14 +2127,6 @@ class EditorWrappingInfoComputer<K1 extends EditorOption, K2 extends PossibleKey
 			wrappingColumn: bareWrappingInfo.wrappingColumn,
 		};
 	}
-	public equals(a: EditorWrappingInfo, b: EditorWrappingInfo): boolean {
-		return (
-			a.isDominatedByLongLines === b.isDominatedByLongLines
-			&& a.isWordWrapMinified === b.isWordWrapMinified
-			&& a.isViewportWrapping === b.isViewportWrapping
-			&& a.wrappingColumn === b.wrappingColumn
-		);
-	}
 }
 
 //#endregion