Merge from vscode 3d67364fbfcf676d93be64f949e9b33e7f1b969e (#5028)

This commit is contained in:
Anthony Dresser
2019-04-14 22:29:14 -07:00
committed by GitHub
parent 6dbf757385
commit 57242a2e13
210 changed files with 4898 additions and 3018 deletions

View File

@@ -48,7 +48,7 @@ export class OpenSettings2Action extends Action {
}
run(event?: any): Promise<any> {
return this.preferencesService.openSettings(false);
return this.preferencesService.openSettings(false, undefined);
}
}
@@ -66,7 +66,7 @@ export class OpenSettingsJsonAction extends Action {
}
run(event?: any): Promise<any> {
return this.preferencesService.openSettings(true);
return this.preferencesService.openSettings(true, undefined);
}
}