ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)

Browse Source 
* Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d

* Fix vs unit tests and hygiene issue

* Fix strict null check issue
This commit is contained in:
Chris LaFreniere
2019-06-10 18:27:09 -07:00
committed by GitHub
parent ff38bc8143
commit d15a3fcc98
926 changed files with 19529 additions and 11383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/services/preferences/browser/preferencesService.ts
View File

@@ -524,9 +524,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
switch (configurationTarget) {
case ConfigurationTarget.USER:
case ConfigurationTarget.USER_LOCAL:
return URI.file(this.environmentService.appSettingsPath);
return this.environmentService.settingsResource;
case ConfigurationTarget.USER_REMOTE:
return URI.file(this.environmentService.appSettingsPath);
return this.environmentService.settingsResource;
case ConfigurationTarget.WORKSPACE:
if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
return null;