diff options
author | Rob Lourens <roblourens@gmail.com> | 2021-03-02 21:27:43 +0300 |
---|---|---|
committer | Rob Lourens <roblourens@gmail.com> | 2021-03-02 21:27:43 +0300 |
commit | ac575425edc2c03a5bfc4301f89c63228313ae60 (patch) | |
tree | ec1c21a2a9e03fbb2ea9c8124d1b81f8c96846fb | |
parent | 911868fa1264673d1461230e378ff9c8f3531f3c (diff) |
Ensure EditorOptions subclass is passed to openEditor
Fix #117952
-rw-r--r-- | src/vs/workbench/services/preferences/browser/preferencesService.ts | 6 |
1 files 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, <EditorInput>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); }); } |