From 4823d69c768bb6605609402969084c9a90af2408 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 3 Mar 2020 14:28:52 +0100 Subject: [PATCH] Adopt edit setting option in settings editor --- .../contrib/preferences/browser/settingsEditor2.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts index cf55ddeab04..0be05b45226 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts @@ -494,14 +494,13 @@ export class SettingsEditor2 extends BaseEditor { } switchToSettingsFile(): Promise { - const query = parseQuery(this.searchWidget.getValue()); - return this.openSettingsFile(query.query); + const query = parseQuery(this.searchWidget.getValue()).query; + return this.openSettingsFile({ query }); } - private async openSettingsFile(query?: string): Promise { + private async openSettingsFile(options?: ISettingsEditorOptions): Promise { const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget; - const options: ISettingsEditorOptions = { query }; if (currentSettingsTarget === ConfigurationTarget.USER_LOCAL) { return this.preferencesService.openGlobalSettings(true, options); } else if (currentSettingsTarget === ConfigurationTarget.USER_REMOTE) { @@ -660,7 +659,7 @@ export class SettingsEditor2 extends BaseEditor { this.settingRenderers = this.instantiationService.createInstance(SettingTreeRenderers); this._register(this.settingRenderers.onDidChangeSetting(e => this.onDidChangeSetting(e.key, e.value, e.type))); this._register(this.settingRenderers.onDidOpenSettings(settingKey => { - this.openSettingsFile(settingKey); + this.openSettingsFile({ editSetting: settingKey }); })); this._register(this.settingRenderers.onDidClickSettingLink(settingName => this.onDidClickSetting(settingName))); this._register(this.settingRenderers.onDidFocusSetting(element => { -- GitLab