Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-31 20:46:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #91953 from microsoft/sandy081/implement89512

Browse Source 
Adopt edit setting option in settings editor
This commit is contained in:
Rob Lourens
2020-03-03 18:57:52 -08:00
committed by GitHub
parent 2057e931c8 4823d69c76
commit bedd22ce0a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
+4 -5
View File
@@ -494,14 +494,13 @@ export class SettingsEditor2 extends BaseEditor {
}
switchToSettingsFile(): Promise<IEditorPane | undefined> {
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<IEditorPane | undefined> {
private async openSettingsFile(options?: ISettingsEditorOptions): Promise<IEditorPane | undefined> {
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 => {