rename

src/vs/editor/test/common/services/resourceConfigurationService.test.ts

@@ -50,9 +50,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into given memory target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceFolderValue: '2'
+			default: '1',
+			userLocal: '2',
+			workspaceFolder: '2'
 		};
 		const resource = URI.file('someFile');
 
@@ -63,9 +63,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into given workspace target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceFolderValue: '2'
+			default: '1',
+			userLocal: '2',
+			workspaceFolder: '2'
 		};
 		const resource = URI.file('someFile');
 
@@ -76,9 +76,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into given user target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceFolderValue: '2'
+			default: '1',
+			userLocal: '2',
+			workspaceFolder: '2'
 		};
 		const resource = URI.file('someFile');
 
@@ -89,9 +89,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into given workspace folder target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceFolderValue: '2',
+			default: '1',
+			userLocal: '2',
+			workspaceFolder: '2',
 			workspaceFolderOverridden: '1'
 		};
 		const resource = URI.file('someFile');
@@ -103,9 +103,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived workspace folder target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceFolderValue: '2',
+			default: '1',
+			userLocal: '2',
+			workspaceFolder: '2',
 		};
 		const resource = URI.file('someFile');
 
@@ -116,10 +116,10 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived workspace folder target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceValue: '2',
-			workspaceFolderValue: '2',
+			default: '1',
+			userLocal: '2',
+			workspace: '2',
+			workspaceFolder: '2',
 			workspaceOverridden: '3',
 			workspaceFolderOverridden: '1'
 		};
@@ -132,9 +132,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived workspace target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceValue: '2',
+			default: '1',
+			userLocal: '2',
+			workspace: '2',
 		};
 		const resource = URI.file('someFile');
 
@@ -145,9 +145,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived workspace target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			workspaceValue: '2',
+			default: '1',
+			userLocal: '2',
+			workspace: '2',
 			workspaceOverridden: 3
 		};
 		const resource = URI.file('someFile');
@@ -159,9 +159,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user remote target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			userRemoteValue: '3',
+			default: '1',
+			userLocal: '2',
+			userRemote: '3',
 		};
 		const resource = URI.file('someFile');
 
@@ -172,9 +172,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user remote target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			userRemoteValue: '3',
+			default: '1',
+			userLocal: '2',
+			userRemote: '3',
 			userRemoteOverridden: '3',
 		};
 		const resource = URI.file('someFile');
@@ -185,9 +185,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user remote target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			userRemoteValue: '3',
+			default: '1',
+			userLocal: '2',
+			userRemote: '3',
 		};
 		const resource = URI.file('someFile');
 
@@ -198,9 +198,9 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user remote target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
-			userRemoteValue: '3',
+			default: '1',
+			userLocal: '2',
+			userRemote: '3',
 			userRemoteOverridden: '3',
 		};
 		const resource = URI.file('someFile');
@@ -212,8 +212,8 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user target without overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
+			default: '1',
+			userLocal: '2',
 		};
 		const resource = URI.file('someFile');
 
@@ -224,8 +224,8 @@ suite('TextResourceConfigurationService - Update', () => {
 	test('updateValue writes into derived user target with overrides', async () => {
 		language = 'a';
 		configurationValue = {
-			defaultValue: '1',
-			userLocalValue: '2',
+			default: '1',
+			userLocal: '2',
 			userLocalOverridden: '3'
 		};
 		const resource = URI.file('someFile');

src/vs/platform/configuration/common/configuration.ts

@@ -65,22 +65,22 @@ export interface IConfigurationChangeEvent {
 
 export interface IConfigurationValue<T> {
 
-	readonly defaultValue?: T;
-	readonly userValue?: T;
-	readonly userLocalValue?: T;
-	readonly userRemoteValue?: T;
-	readonly workspaceValue?: T;
-	readonly workspaceFolderValue?: T;
-	readonly memoryValue?: T;
+	readonly default?: T;
+	readonly user?: T;
+	readonly userLocal?: T;
+	readonly userRemote?: T;
+	readonly workspace?: T;
+	readonly workspaceFolder?: T;
+	readonly memory?: T;
 	readonly value?: T;
 
-	readonly default?: { value?: T, override?: T };
-	readonly user?: { value?: T, override?: T };
-	readonly userLocal?: { value?: T, override?: T };
-	readonly userRemote?: { value?: T, override?: T };
-	readonly workspace?: { value?: T, override?: T };
-	readonly workspaceFolder?: { value?: T, override?: T };
-	readonly memory?: { value?: T, override?: T };
+	readonly defaultTarget?: { value?: T, override?: T };
+	readonly userTarget?: { value?: T, override?: T };
+	readonly userLocalTarget?: { value?: T, override?: T };
+	readonly userRemoteTarget?: { value?: T, override?: T };
+	readonly workspaceTarget?: { value?: T, override?: T };
+	readonly workspaceFolderTarget?: { value?: T, override?: T };
+	readonly memoryTarget?: { value?: T, override?: T };
 }
 
 export interface IConfigurationService {
@@ -357,11 +357,11 @@ export function getMigratedSettingValue<T>(configurationService: IConfigurationS
 	const setting = configurationService.inspect<T>(currentSettingName);
 	const legacySetting = configurationService.inspect<T>(legacySettingName);
 
-	if (typeof setting.userValue !== 'undefined' || typeof setting.workspaceValue !== 'undefined' || typeof setting.workspaceFolderValue !== 'undefined') {
+	if (typeof setting.user !== 'undefined' || typeof setting.workspace !== 'undefined' || typeof setting.workspaceFolder !== 'undefined') {
 		return setting.value!;
-	} else if (typeof legacySetting.userValue !== 'undefined' || typeof legacySetting.workspaceValue !== 'undefined' || typeof legacySetting.workspaceFolderValue !== 'undefined') {
+	} else if (typeof legacySetting.user !== 'undefined' || typeof legacySetting.workspace !== 'undefined' || typeof legacySetting.workspaceFolder !== 'undefined') {
 		return legacySetting.value!;
 	} else {
-		return setting.defaultValue!;
+		return setting.default!;
 	}
 }

src/vs/platform/configuration/common/configurationModels.ts

@@ -384,22 +384,22 @@ export class Configuration {
 		const value = consolidateConfigurationModel.getValue<C>(key);
 
 		return {
-			defaultValue,
-			userValue,
-			userLocalValue,
-			userRemoteValue,
-			workspaceValue,
-			workspaceFolderValue,
-			memoryValue,
+			default: defaultValue,
+			user: userValue,
+			userLocal: userLocalValue,
+			userRemote: userRemoteValue,
+			workspace: workspaceValue,
+			workspaceFolder: workspaceFolderValue,
+			memory: memoryValue,
 			value,
 
-			default: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			user: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			userLocal: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			userRemote: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			workspace: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			workspaceFolder: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
-			memory: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			defaultTarget: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			userTarget: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			userLocalTarget: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			userRemoteTarget: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			workspaceTarget: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			workspaceFolderTarget: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
+			memoryTarget: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
 		};
 	}
 

src/vs/platform/configuration/test/common/testConfigurationService.ts

@@ -60,8 +60,8 @@ export class TestConfigurationService implements IConfigurationService {
 
 		return {
 			value: getConfigurationValue<T>(config, key),
-			defaultValue: getConfigurationValue<T>(config, key),
-			userValue: getConfigurationValue<T>(config, key)
+			default: getConfigurationValue<T>(config, key),
+			user: getConfigurationValue<T>(config, key)
 		};
 	}
 

src/vs/workbench/api/common/extHostConfiguration.ts

@@ -204,10 +204,10 @@ export class ExtHostConfigProvider {
 				if (config) {
 					return {
 						key,
-						defaultValue: config.defaultValue,
-						globalValue: config.userValue,
-						workspaceValue: config.workspaceValue,
-						workspaceFolderValue: config.workspaceFolderValue
+						defaultValue: config.default,
+						globalValue: config.user,
+						workspaceValue: config.workspace,
+						workspaceFolderValue: config.workspaceFolder
 					};
 				}
 				return undefined;

src/vs/workbench/browser/parts/editor/editorStatus.ts

@@ -1158,12 +1158,12 @@ export class ChangeModeAction extends Action {
 
 				// If the association is already being made in the workspace, make sure to target workspace settings
 				let target = ConfigurationTarget.USER;
-				if (fileAssociationsConfig.workspaceValue && !!(fileAssociationsConfig.workspaceValue as any)[associationKey]) {
+				if (fileAssociationsConfig.workspace && !!(fileAssociationsConfig.workspace as any)[associationKey]) {
 					target = ConfigurationTarget.WORKSPACE;
 				}
 
 				// Make sure to write into the value of the target and not the merged value from USER and WORKSPACE config
-				const currentAssociations = deepClone((target === ConfigurationTarget.WORKSPACE) ? fileAssociationsConfig.workspaceValue : fileAssociationsConfig.userValue) || Object.create(null);
+				const currentAssociations = deepClone((target === ConfigurationTarget.WORKSPACE) ? fileAssociationsConfig.workspace : fileAssociationsConfig.user) || Object.create(null);
 				currentAssociations[associationKey] = language.id;
 
 				this.configurationService.updateValue(FILES_ASSOCIATIONS_CONFIG, currentAssociations, target);

src/vs/workbench/contrib/debug/browser/debugConfigurationManager.ts

@@ -551,7 +551,7 @@ class Launch extends AbstractLaunch implements ILaunch {
 	}
 
 	protected getConfig(): IGlobalConfig | undefined {
-		return this.configurationService.inspect<IGlobalConfig>('launch', { resource: this.workspace.uri }).workspaceFolderValue;
+		return this.configurationService.inspect<IGlobalConfig>('launch', { resource: this.workspace.uri }).workspaceFolder;
 	}
 
 	async openConfigFile(sideBySide: boolean, preserveFocus: boolean, type?: string, token?: CancellationToken): Promise<{ editor: IEditor | null, created: boolean }> {
@@ -631,7 +631,7 @@ class WorkspaceLaunch extends AbstractLaunch implements ILaunch {
 	}
 
 	protected getConfig(): IGlobalConfig | undefined {
-		return this.configurationService.inspect<IGlobalConfig>('launch').workspaceValue;
+		return this.configurationService.inspect<IGlobalConfig>('launch').workspace;
 	}
 
 	async openConfigFile(sideBySide: boolean, preserveFocus: boolean): Promise<{ editor: IEditor | null, created: boolean }> {
@@ -674,7 +674,7 @@ class UserLaunch extends AbstractLaunch implements ILaunch {
 	}
 
 	protected getConfig(): IGlobalConfig | undefined {
-		return this.configurationService.inspect<IGlobalConfig>('launch').userValue;
+		return this.configurationService.inspect<IGlobalConfig>('launch').user;
 	}
 
 	async openConfigFile(_: boolean, preserveFocus: boolean): Promise<{ editor: IEditor | null, created: boolean }> {

src/vs/workbench/contrib/extensions/browser/extensionsActions.ts

@@ -1379,7 +1379,7 @@ export class SetColorThemeAction extends ExtensionAction {
 				ignoreFocusLost
 			});
 		let confValue = this.configurationService.inspect(COLOR_THEME_SETTING);
-		const target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+		const target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 		return this.workbenchThemeService.setColorTheme(pickedTheme ? pickedTheme.id : currentTheme.id, target);
 	}
 }
@@ -1445,7 +1445,7 @@ export class SetFileIconThemeAction extends ExtensionAction {
 				ignoreFocusLost
 			});
 		let confValue = this.configurationService.inspect(ICON_THEME_SETTING);
-		const target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+		const target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 		return this.workbenchThemeService.setFileIconTheme(pickedTheme ? pickedTheme.id : currentTheme.id, target);
 	}
 }

src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts

@@ -799,7 +799,7 @@ export class SettingsEditor2 extends BaseEditor {
 
 		// If the user is changing the value back to the default, do a 'reset' instead
 		const inspected = this.configurationService.inspect(key, overrides);
-		if (inspected.defaultValue === value) {
+		if (inspected.default === value) {
 			value = undefined;
 		}
 

src/vs/workbench/contrib/preferences/browser/settingsTreeModels.ts

@@ -155,23 +155,23 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
 	update(inspectResult: IInspectResult): void {
 		const { isConfigured, inspected, targetSelector } = inspectResult;
 
-		const displayValue = isConfigured ? inspected[targetSelector] : inspected.defaultValue;
+		const displayValue = isConfigured ? inspected[targetSelector] : inspected.default;
 		const overriddenScopeList: string[] = [];
-		if (targetSelector !== 'workspace' && typeof inspected.workspaceValue !== 'undefined') {
+		if (targetSelector !== 'workspace' && typeof inspected.workspace !== 'undefined') {
 			overriddenScopeList.push(localize('workspace', "Workspace"));
 		}
 
-		if (targetSelector !== 'userRemote' && typeof inspected.userRemoteValue !== 'undefined') {
+		if (targetSelector !== 'userRemote' && typeof inspected.userRemote !== 'undefined') {
 			overriddenScopeList.push(localize('remote', "Remote"));
 		}
 
-		if (targetSelector !== 'userLocal' && typeof inspected.userLocalValue !== 'undefined') {
+		if (targetSelector !== 'userLocal' && typeof inspected.userLocal !== 'undefined') {
 			overriddenScopeList.push(localize('user', "User"));
 		}
 
 		this.value = displayValue;
 		this.scopeValue = isConfigured && inspected[targetSelector];
-		this.defaultValue = inspected.defaultValue;
+		this.defaultValue = inspected.default;
 
 		this.isConfigured = isConfigured;
 		if (isConfigured || this.setting.tags || this.tags) {

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

@@ -1667,7 +1667,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (this.executionEngine === ExecutionEngine.Process) {
 			return this.emptyWorkspaceTaskResults(workspaceFolder);
 		}
-		const configuration = this.testParseExternalConfig(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks').workspaceValue, nls.localize('TasksSystem.locationWorkspaceConfig', 'workspace file'));
+		const configuration = this.testParseExternalConfig(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks').workspace, nls.localize('TasksSystem.locationWorkspaceConfig', 'workspace file'));
 		let customizedTasks: { byIdentifier: IStringDictionary<ConfiguringTask>; } = {
 			byIdentifier: Object.create(null)
 		};
@@ -1686,7 +1686,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (this.executionEngine === ExecutionEngine.Process) {
 			return this.emptyWorkspaceTaskResults(workspaceFolder);
 		}
-		const configuration = this.testParseExternalConfig(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks').userValue, nls.localize('TasksSystem.locationUserConfig', 'user settings'));
+		const configuration = this.testParseExternalConfig(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks').user, nls.localize('TasksSystem.locationUserConfig', 'user settings'));
 		let customizedTasks: { byIdentifier: IStringDictionary<ConfiguringTask>; } = {
 			byIdentifier: Object.create(null)
 		};
@@ -1789,7 +1789,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 
 	protected getConfiguration(workspaceFolder: IWorkspaceFolder): { config: TaskConfig.ExternalTaskRunnerConfiguration | undefined; hasParseErrors: boolean } {
 		let result = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY
-			? Objects.deepClone(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks', { resource: workspaceFolder.uri }).workspaceFolderValue)
+			? Objects.deepClone(this.configurationService.inspect<TaskConfig.ExternalTaskRunnerConfiguration>('tasks', { resource: workspaceFolder.uri }).workspaceFolder)
 			: undefined;
 		if (!result) {
 			return { config: undefined, hasParseErrors: false };

src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.ts

@@ -196,13 +196,13 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
 
 		// Check if workspace setting exists and whether it's whitelisted
 		let isWorkspaceShellAllowed: boolean | undefined = false;
-		if (shellConfigValue.workspaceValue !== undefined || shellArgsConfigValue.workspaceValue !== undefined || envConfigValue.workspaceValue !== undefined) {
+		if (shellConfigValue.workspace !== undefined || shellArgsConfigValue.workspace !== undefined || envConfigValue.workspace !== undefined) {
 			isWorkspaceShellAllowed = this.isWorkspaceShellAllowed(undefined);
 		}
 
 		// Always allow [] args as it would lead to an odd error message and should not be dangerous
-		if (shellConfigValue.workspaceValue === undefined && envConfigValue.workspaceValue === undefined &&
-			shellArgsConfigValue.workspaceValue && shellArgsConfigValue.workspaceValue.length === 0) {
+		if (shellConfigValue.workspace === undefined && envConfigValue.workspace === undefined &&
+			shellArgsConfigValue.workspace && shellArgsConfigValue.workspace.length === 0) {
 			isWorkspaceShellAllowed = true;
 		}
 
@@ -210,16 +210,16 @@ export class TerminalConfigHelper implements IBrowserTerminalConfigHelper {
 		// permission
 		if (isWorkspaceShellAllowed === undefined) {
 			let shellString: string | undefined;
-			if (shellConfigValue.workspaceValue) {
-				shellString = `shell: "${shellConfigValue.workspaceValue}"`;
+			if (shellConfigValue.workspace) {
+				shellString = `shell: "${shellConfigValue.workspace}"`;
 			}
 			let argsString: string | undefined;
-			if (shellArgsConfigValue.workspaceValue) {
-				argsString = `shellArgs: [${shellArgsConfigValue.workspaceValue.map(v => '"' + v + '"').join(', ')}]`;
+			if (shellArgsConfigValue.workspace) {
+				argsString = `shellArgs: [${shellArgsConfigValue.workspace.map(v => '"' + v + '"').join(', ')}]`;
 			}
 			let envString: string | undefined;
-			if (envConfigValue.workspaceValue) {
-				envString = `env: {${Object.keys(envConfigValue.workspaceValue).map(k => `${k}:${envConfigValue.workspaceValue![k]}`).join(', ')}}`;
+			if (envConfigValue.workspace) {
+				envString = `env: {${Object.keys(envConfigValue.workspace).map(k => `${k}:${envConfigValue.workspace![k]}`).join(', ')}}`;
 			}
 			// Should not be localized as it's json-like syntax referencing settings keys
 			const workspaceConfigStrings: string[] = [];

src/vs/workbench/contrib/themes/browser/themes.contribution.ts

@@ -63,7 +63,7 @@ export class SelectColorThemeAction extends Action {
 					let target: ConfigurationTarget | undefined = undefined;
 					if (applyTheme) {
 						const confValue = this.configurationService.inspect(COLOR_THEME_SETTING);
-						target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+						target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 					}
 
 					this.themeService.setColorTheme(themeId, target).then(undefined,
@@ -148,7 +148,7 @@ class SelectIconThemeAction extends Action {
 					let target: ConfigurationTarget | undefined = undefined;
 					if (applyTheme) {
 						const confValue = this.configurationService.inspect(ICON_THEME_SETTING);
-						target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
+						target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
 					}
 					this.themeService.setFileIconTheme(themeId, target).then(undefined,
 						err => {

src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts

@@ -108,7 +108,7 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 
 function isWelcomePageEnabled(configurationService: IConfigurationService, contextService: IWorkspaceContextService) {
 	const startupEditor = configurationService.inspect(configurationKey);
-	if (!startupEditor.userValue && !startupEditor.workspaceValue) {
+	if (!startupEditor.user && !startupEditor.workspace) {
 		const welcomeEnabled = configurationService.inspect(oldConfigurationKey);
 		if (welcomeEnabled.value !== undefined && welcomeEnabled.value !== null) {
 			return welcomeEnabled.value;

src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts

@@ -950,27 +950,27 @@ suite('WorkspaceConfigurationService - Folder', () => {
 
 	test('inspect', () => {
 		let actual = testObject.inspect('something.missing');
-		assert.equal(actual.defaultValue, undefined);
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.default, undefined);
+		assert.equal(actual.user, undefined);
+		assert.equal(actual.workspace, undefined);
+		assert.equal(actual.workspaceFolder, undefined);
 		assert.equal(actual.value, undefined);
 
 		actual = testObject.inspect('configurationService.folder.testSetting');
-		assert.equal(actual.defaultValue, 'isSet');
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.default, 'isSet');
+		assert.equal(actual.user, undefined);
+		assert.equal(actual.workspace, undefined);
+		assert.equal(actual.workspaceFolder, undefined);
 		assert.equal(actual.value, 'isSet');
 
 		fs.writeFileSync(globalSettingsFile, '{ "configurationService.folder.testSetting": "userValue" }');
 		return testObject.reloadConfiguration()
 			.then(() => {
 				actual = testObject.inspect('configurationService.folder.testSetting');
-				assert.equal(actual.defaultValue, 'isSet');
-				assert.equal(actual.userValue, 'userValue');
-				assert.equal(actual.workspaceValue, undefined);
-				assert.equal(actual.workspaceFolderValue, undefined);
+				assert.equal(actual.default, 'isSet');
+				assert.equal(actual.user, 'userValue');
+				assert.equal(actual.workspace, undefined);
+				assert.equal(actual.workspaceFolder, undefined);
 				assert.equal(actual.value, 'userValue');
 
 				fs.writeFileSync(path.join(workspaceDir, '.vscode', 'settings.json'), '{ "configurationService.folder.testSetting": "workspaceValue" }');
@@ -978,10 +978,10 @@ suite('WorkspaceConfigurationService - Folder', () => {
 				return testObject.reloadConfiguration()
 					.then(() => {
 						actual = testObject.inspect('configurationService.folder.testSetting');
-						assert.equal(actual.defaultValue, 'isSet');
-						assert.equal(actual.userValue, 'userValue');
-						assert.equal(actual.workspaceValue, 'workspaceValue');
-						assert.equal(actual.workspaceFolderValue, undefined);
+						assert.equal(actual.default, 'isSet');
+						assert.equal(actual.user, 'userValue');
+						assert.equal(actual.workspace, 'workspaceValue');
+						assert.equal(actual.workspaceFolder, undefined);
 						assert.equal(actual.value, 'workspaceValue');
 					});
 			});
@@ -1308,37 +1308,37 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 
 	test('inspect', () => {
 		let actual = testObject.inspect('something.missing');
-		assert.equal(actual.defaultValue, undefined);
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.default, undefined);
+		assert.equal(actual.user, undefined);
+		assert.equal(actual.workspace, undefined);
+		assert.equal(actual.workspaceFolder, undefined);
 		assert.equal(actual.value, undefined);
 
 		actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-		assert.equal(actual.defaultValue, 'isSet');
-		assert.equal(actual.userValue, undefined);
-		assert.equal(actual.workspaceValue, undefined);
-		assert.equal(actual.workspaceFolderValue, undefined);
+		assert.equal(actual.default, 'isSet');
+		assert.equal(actual.user, undefined);
+		assert.equal(actual.workspace, undefined);
+		assert.equal(actual.workspaceFolder, undefined);
 		assert.equal(actual.value, 'isSet');
 
 		fs.writeFileSync(globalSettingsFile, '{ "configurationService.workspace.testResourceSetting": "userValue" }');
 		return testObject.reloadConfiguration()
 			.then(() => {
 				actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-				assert.equal(actual.defaultValue, 'isSet');
-				assert.equal(actual.userValue, 'userValue');
-				assert.equal(actual.workspaceValue, undefined);
-				assert.equal(actual.workspaceFolderValue, undefined);
+				assert.equal(actual.default, 'isSet');
+				assert.equal(actual.user, 'userValue');
+				assert.equal(actual.workspace, undefined);
+				assert.equal(actual.workspaceFolder, undefined);
 				assert.equal(actual.value, 'userValue');
 
 				return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ key: 'settings', value: { 'configurationService.workspace.testResourceSetting': 'workspaceValue' } }], true)
 					.then(() => testObject.reloadConfiguration())
 					.then(() => {
 						actual = testObject.inspect('configurationService.workspace.testResourceSetting');
-						assert.equal(actual.defaultValue, 'isSet');
-						assert.equal(actual.userValue, 'userValue');
-						assert.equal(actual.workspaceValue, 'workspaceValue');
-						assert.equal(actual.workspaceFolderValue, undefined);
+						assert.equal(actual.default, 'isSet');
+						assert.equal(actual.user, 'userValue');
+						assert.equal(actual.workspace, 'workspaceValue');
+						assert.equal(actual.workspaceFolder, undefined);
 						assert.equal(actual.value, 'workspaceValue');
 
 						fs.writeFileSync(workspaceContextService.getWorkspace().folders[0].toResource('.vscode/settings.json').fsPath, '{ "configurationService.workspace.testResourceSetting": "workspaceFolderValue" }');
@@ -1346,10 +1346,10 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 						return testObject.reloadConfiguration()
 							.then(() => {
 								actual = testObject.inspect('configurationService.workspace.testResourceSetting', { resource: workspaceContextService.getWorkspace().folders[0].uri });
-								assert.equal(actual.defaultValue, 'isSet');
-								assert.equal(actual.userValue, 'userValue');
-								assert.equal(actual.workspaceValue, 'workspaceValue');
-								assert.equal(actual.workspaceFolderValue, 'workspaceFolderValue');
+								assert.equal(actual.default, 'isSet');
+								assert.equal(actual.user, 'userValue');
+								assert.equal(actual.workspace, 'workspaceValue');
+								assert.equal(actual.workspaceFolder, 'workspaceFolderValue');
 								assert.equal(actual.value, 'workspaceFolderValue');
 							});
 					});
@@ -1401,7 +1401,7 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ key: 'launch', value: expectedLaunchConfiguration }], true)
 			.then(() => testObject.reloadConfiguration())
 			.then(() => {
-				const actual = testObject.inspect('launch').workspaceValue;
+				const actual = testObject.inspect('launch').workspace;
 				assert.deepEqual(actual, expectedLaunchConfiguration);
 			});
 	});
@@ -1448,7 +1448,7 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration!, [{ key: 'tasks', value: expectedTasksConfiguration }], true)
 			.then(() => testObject.reloadConfiguration())
 			.then(() => {
-				const actual = testObject.inspect('tasks').workspaceValue;
+				const actual = testObject.inspect('tasks').workspace;
 				assert.deepEqual(actual, expectedTasksConfiguration);
 			});
 	});

src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.ts

@@ -184,9 +184,9 @@ export class FilesConfigurationService extends Disposable implements IFilesConfi
 
 	async toggleAutoSave(): Promise<void> {
 		const setting = this.configurationService.inspect('files.autoSave');
-		let userAutoSaveConfig = setting.userValue;
+		let userAutoSaveConfig = setting.user;
 		if (isUndefinedOrNull(userAutoSaveConfig)) {
-			userAutoSaveConfig = setting.defaultValue; // use default if setting not defined
+			userAutoSaveConfig = setting.default; // use default if setting not defined
 		}
 
 		let newAutoSaveValue: string;

src/vs/workbench/services/themes/browser/workbenchThemeService.ts

@@ -580,9 +580,9 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 	public writeConfiguration(key: string, value: any, settingsTarget: ConfigurationTarget | 'auto'): Promise<void> {
 		let settings = this.configurationService.inspect(key);
 		if (settingsTarget === 'auto') {
-			if (!types.isUndefined(settings.workspaceFolderValue)) {
+			if (!types.isUndefined(settings.workspaceFolder)) {
 				settingsTarget = ConfigurationTarget.WORKSPACE_FOLDER;
-			} else if (!types.isUndefined(settings.workspaceValue)) {
+			} else if (!types.isUndefined(settings.workspace)) {
 				settingsTarget = ConfigurationTarget.WORKSPACE;
 			} else {
 				settingsTarget = ConfigurationTarget.USER;
@@ -590,10 +590,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
 		}
 
 		if (settingsTarget === ConfigurationTarget.USER) {
-			if (value === settings.userValue) {
+			if (value === settings.user) {
 				return Promise.resolve(undefined); // nothing to do
-			} else if (value === settings.defaultValue) {
-				if (types.isUndefined(settings.userValue)) {
+			} else if (value === settings.default) {
+				if (types.isUndefined(settings.user)) {
 					return Promise.resolve(undefined); // nothing to do
 				}
 				value = undefined; // remove configuration from user settings

src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts

@@ -309,7 +309,7 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 					continue;
 				}
 
-				targetWorkspaceConfiguration[key] = this.configurationService.inspect(key).workspaceValue;
+				targetWorkspaceConfiguration[key] = this.configurationService.inspect(key).workspace;
 			}
 		}