From ac575425edc2c03a5bfc4301f89c63228313ae60 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 2 Mar 2021 10:27:43 -0800 Subject: Ensure EditorOptions subclass is passed to openEditor Fix #117952 --- src/vs/workbench/services/preferences/browser/preferencesService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index 2ab7ac2b6f7..3303c0fd6ea 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -221,7 +221,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic ...options, focusSearch: true }; - return this.editorService.openEditor(input, options ? { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED } : { override: EditorOverride.DISABLED }) + return this.editorService.openEditor(input, options ? SettingsEditorOptions.create({ ...options, override: EditorOverride.DISABLED }) : { override: EditorOverride.DISABLED }) .then(() => this.editorGroupService.activeGroup.activeEditorPane!); } @@ -364,7 +364,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic this.editorService.openEditor(editableSettingsEditorInput, { pinned: true, revealIfOpened: true, override: EditorOverride.DISABLED }, sideEditorGroup.id) ]).then(([defaultEditor, editor]) => withNullAsUndefined(editor)); } else { - return this.editorService.openEditor(editableSettingsEditorInput, { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED }, group); + return this.editorService.openEditor(editableSettingsEditorInput, SettingsEditorOptions.create({ ...options, override: EditorOverride.DISABLED }), group); } }); } @@ -381,7 +381,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic const defaultPreferencesEditorInput = this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(configurationTarget)); const preferencesEditorInput = new PreferencesEditorInput(this.getPreferencesEditorInputName(configurationTarget, resource), editableSettingsEditorInput.getDescription(), defaultPreferencesEditorInput, editableSettingsEditorInput); this.lastOpenedSettingsInput = preferencesEditorInput; - return this.editorService.openEditor(preferencesEditorInput, { ...SettingsEditorOptions.create(options), override: EditorOverride.DISABLED }, group); + return this.editorService.openEditor(preferencesEditorInput, SettingsEditorOptions.create({ ...options, override: EditorOverride.DISABLED }), group); }); } -- cgit v1.2.3