development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 21:39:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #72813

Browse source
This commit is contained in:
Rob Lourens 2019-04-24 18:10:43 +00:00
parent 2c5928e606
commit cb75ef9d0f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
View file

@ -205,7 +205,7 @@ export class SettingsEditor2 extends BaseEditor {
this.updateStyles();
}
setInput(input: SettingsEditor2Input, options: SettingsEditorOptions, token: CancellationToken): Promise<void> {
setInput(input: SettingsEditor2Input, options: SettingsEditorOptions | null, token: CancellationToken): Promise<void> {
this.inSettingsEditorContextKey.set(true);
return super.setInput(input, options, token)
.then(() => new Promise(process.nextTick)) // Force setInput to be async
@ -213,10 +213,10 @@ export class SettingsEditor2 extends BaseEditor {
return this.render(token);
})
.then(() => {
options = options || SettingsEditorOptions.create({});
if (!this.viewState.settingsTarget) {
if (!options) {
options = SettingsEditorOptions.create({ target: ConfigurationTarget.USER_LOCAL });
} else if (!options.target) {
if (!options.target) {
options.target = ConfigurationTarget.USER_LOCAL;
}
}