8000 Ensure EditorOptions subclass is passed to openEditor by roblourens · Pull Request #117982 · microsoft/vscode · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Ensure EditorOptions subclass is passed to openEditor #117982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2021
Merged

Ensure EditorOptions subclass is passed to openEditor #117982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/vs/workbench/services/preferences/browser/preferencesService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!);
}

Expand Down Expand Up @@ -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);
}
});
}
Expand All @@ -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);
});
}

Expand Down
0