options - better overwrite()

Benjamin Pasero · Benjamin Pasero · commit 2e26a4f252cc · 2019-08-26T16:40:02.000+02:00
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -772,36 +772,36 @@ export class EditorOptions implements IEditorOptions {
 	 * Overwrites option values from the provided bag.
 	 */
 	overwrite(options: IEditorOptions): EditorOptions {
-		if (options.forceReload) {
-			this.forceReload = true;
+		if (typeof options.forceReload === 'boolean') {
+			this.forceReload = options.forceReload;
 		}
 
-		if (options.revealIfVisible) {
-			this.revealIfVisible = true;
+		if (typeof options.revealIfVisible === 'boolean') {
+			this.revealIfVisible = options.revealIfVisible;
 		}
 
-		if (options.revealIfOpened) {
-			this.revealIfOpened = true;
+		if (typeof options.revealIfOpened === 'boolean') {
+			this.revealIfOpened = options.revealIfOpened;
 		}
 
-		if (options.preserveFocus) {
-			this.preserveFocus = true;
+		if (typeof options.preserveFocus === 'boolean') {
+			this.preserveFocus = options.preserveFocus;
 		}
 
-		if (options.forceActive) {
-			this.forceActive = true;
+		if (typeof options.forceActive === 'boolean') {
+			this.forceActive = options.forceActive;
 		}
 
-		if (options.pinned) {
-			this.pinned = true;
+		if (typeof options.pinned === 'boolean') {
+			this.pinned = options.pinned;
 		}
 
-		if (options.inactive) {
-			this.inactive = true;
+		if (typeof options.inactive === 'boolean') {
+			this.inactive = options.inactive;
 		}
 
-		if (options.ignoreError) {
-			this.ignoreError = true;
+		if (typeof options.ignoreError === 'boolean') {
+			this.ignoreError = options.ignoreError;
 		}
 
 		if (typeof options.index === 'number') {
@@ -857,8 +857,8 @@ export class TextEditorOptions extends EditorOptions {
 			this.editorViewState = options.viewState as IEditorViewState;
 		}
 
-		if (options.revealInCenterIfOutsideViewport) {
-			this.revealInCenterIfOutsideViewport = true;
+		if (typeof options.revealInCenterIfOutsideViewport === 'boolean') {
+			this.revealInCenterIfOutsideViewport = options.revealInCenterIfOutsideViewport;
 		}
 
 		return this;

Original file line number	Diff line number	Diff line change
`@@ -772,36 +772,36 @@ export class EditorOptions implements IEditorOptions {`
`772`	`772`	`* Overwrites option values from the provided bag.`
`773`	`773`	`*/`
`774`	`774`	`overwrite(options: IEditorOptions): EditorOptions {`
`775`		`- if (options.forceReload) {`
`776`		`- this.forceReload = true;`
	`775`	`+ if (typeof options.forceReload === 'boolean') {`
	`776`	`+ this.forceReload = options.forceReload;`
`777`	`777`	`}`
`778`	`778`
`779`		`- if (options.revealIfVisible) {`
`780`		`- this.revealIfVisible = true;`
	`779`	`+ if (typeof options.revealIfVisible === 'boolean') {`
	`780`	`+ this.revealIfVisible = options.revealIfVisible;`
`781`	`781`	`}`
`782`	`782`
`783`		`- if (options.revealIfOpened) {`
`784`		`- this.revealIfOpened = true;`
	`783`	`+ if (typeof options.revealIfOpened === 'boolean') {`
	`784`	`+ this.revealIfOpened = options.revealIfOpened;`
`785`	`785`	`}`
`786`	`786`
`787`		`- if (options.preserveFocus) {`
`788`		`- this.preserveFocus = true;`
	`787`	`+ if (typeof options.preserveFocus === 'boolean') {`
	`788`	`+ this.preserveFocus = options.preserveFocus;`
`789`	`789`	`}`
`790`	`790`
`791`		`- if (options.forceActive) {`
`792`		`- this.forceActive = true;`
	`791`	`+ if (typeof options.forceActive === 'boolean') {`
	`792`	`+ this.forceActive = options.forceActive;`
`793`	`793`	`}`
`794`	`794`
`795`		`- if (options.pinned) {`
`796`		`- this.pinned = true;`
	`795`	`+ if (typeof options.pinned === 'boolean') {`
	`796`	`+ this.pinned = options.pinned;`
`797`	`797`	`}`
`798`	`798`
`799`		`- if (options.inactive) {`
`800`		`- this.inactive = true;`
	`799`	`+ if (typeof options.inactive === 'boolean') {`
	`800`	`+ this.inactive = options.inactive;`
`801`	`801`	`}`
`802`	`802`
`803`		`- if (options.ignoreError) {`
`804`		`- this.ignoreError = true;`
	`803`	`+ if (typeof options.ignoreError === 'boolean') {`
	`804`	`+ this.ignoreError = options.ignoreError;`
`805`	`805`	`}`
`806`	`806`
`807`	`807`	`if (typeof options.index === 'number') {`
`@@ -857,8 +857,8 @@ export class TextEditorOptions extends EditorOptions {`
`857`	`857`	`this.editorViewState = options.viewState as IEditorViewState;`
`858`	`858`	`}`
`859`	`859`
`860`		`- if (options.revealInCenterIfOutsideViewport) {`
`861`		`- this.revealInCenterIfOutsideViewport = true;`
	`860`	`+ if (typeof options.revealInCenterIfOutsideViewport === 'boolean') {`
	`861`	`+ this.revealInCenterIfOutsideViewport = options.revealInCenterIfOutsideViewport;`
`862`	`862`	`}`
`863`	`863`
`864`	`864`	`return this;`