ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-31 09:10:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2b87545500dbc7899a493d69199aa4e061414ea0 (#5148)

Browse Source
This commit is contained in:
Anthony Dresser
2019-04-22 16:57:13 -07:00
committed by GitHub
parent 1b24dff738
commit 5e62229f25
15 changed files with 139 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts
View File

@@ -12,8 +12,8 @@ import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configur
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
import { SettingsTarget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
import { ITOCEntry, knownAcronyms } from 'vs/workbench/contrib/preferences/browser/settingsLayout';
import { IExtensionSetting, ISearchResult, ISetting, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
import { MODIFIED_SETTING_TAG } from 'vs/workbench/contrib/preferences/common/preferences';
import { IExtensionSetting, ISearchResult, ISetting, SettingValueType } from 'vs/workbench/services/preferences/common/preferences';
export const ONLINE_SERVICES_SETTING_TAG = 'usesOnlineServices';
@@ -142,11 +142,15 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
const displayValue = isConfigured ? inspected[targetSelector] : inspected.default;
const overriddenScopeList: string[] = [];
if (targetSelector === 'user' && typeof inspected.workspace !== 'undefined') {
if (targetSelector !== 'workspace' && typeof inspected.workspace !== 'undefined') {
overriddenScopeList.push(localize('workspace', "Workspace"));
}
if (targetSelector === 'workspace' && typeof inspected.user !== 'undefined') {
if (targetSelector !== 'userRemote' && typeof inspected.userRemote !== 'undefined') {
overriddenScopeList.push(localize('remote', "Remote"));
}
if (targetSelector !== 'userLocal' && typeof inspected.userLocal !== 'undefined') {
overriddenScopeList.push(localize('user', "User"));
}
@@ -354,8 +358,17 @@ export class SettingsTreeModel {
interface IInspectResult {
isConfigured: boolean;
inspected: any;
targetSelector: string;
inspected: {
default: any,
user: any,
userLocal?: any,
userRemote?: any,
workspace?: any,
workspaceFolder?: any,
memory?: any,
value: any,
};
targetSelector: 'userLocal' | 'userRemote' | 'workspace' | 'workspaceFolder';
}
function inspectSetting(key: string, target: SettingsTarget, configurationService: IConfigurationService): IInspectResult {