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 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1 (#8722)

Browse Source 
* Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1

* remove tests that aren't working
This commit is contained in:
Anthony Dresser
2019-12-18 00:14:28 -08:00
committed by GitHub
parent 0fd870d156
commit 30d9e9c141
289 changed files with 5537 additions and 3039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/services/configuration/browser/configurationService.ts
View File

@@ -656,11 +656,11 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
return undefined;
}
if (inspect.workspaceFolder !== undefined) {
if (inspect.workspaceFolderValue !== undefined) {
return ConfigurationTarget.WORKSPACE_FOLDER;
}
if (inspect.workspace !== undefined) {
if (inspect.workspaceValue !== undefined) {
return ConfigurationTarget.WORKSPACE;
}
@@ -690,7 +690,7 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
private toEditableConfigurationTarget(target: ConfigurationTarget, key: string): EditableConfigurationTarget | null {
if (target === ConfigurationTarget.USER) {
if (this.inspect(key).userRemote !== undefined) {
if (this.inspect(key).userRemoteValue !== undefined) {
return EditableConfigurationTarget.USER_REMOTE;
}
return EditableConfigurationTarget.USER_LOCAL;