Skip to content

Commit 0ecc745

Browse files
sandy081sandy081
committed
rename
1 parent 2cbd162 commit 0ecc745

18 files changed

Lines changed: 152 additions & 152 deletions

File tree

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

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ suite('TextResourceConfigurationService - Update', () => {
5050
test('updateValue writes into given memory target without overrides', async () => {
5151
language = 'a';
5252
configurationValue = {
53-
defaultValue: '1',
54-
userLocalValue: '2',
55-
workspaceFolderValue: '2'
53+
default: '1',
54+
userLocal: '2',
55+
workspaceFolder: '2'
5656
};
5757
const resource = URI.file('someFile');
5858

@@ -63,9 +63,9 @@ suite('TextResourceConfigurationService - Update', () => {
6363
test('updateValue writes into given workspace target without overrides', async () => {
6464
language = 'a';
6565
configurationValue = {
66-
defaultValue: '1',
67-
userLocalValue: '2',
68-
workspaceFolderValue: '2'
66+
default: '1',
67+
userLocal: '2',
68+
workspaceFolder: '2'
6969
};
7070
const resource = URI.file('someFile');
7171

@@ -76,9 +76,9 @@ suite('TextResourceConfigurationService - Update', () => {
7676
test('updateValue writes into given user target without overrides', async () => {
7777
language = 'a';
7878
configurationValue = {
79-
defaultValue: '1',
80-
userLocalValue: '2',
81-
workspaceFolderValue: '2'
79+
default: '1',
80+
userLocal: '2',
81+
workspaceFolder: '2'
8282
};
8383
const resource = URI.file('someFile');
8484

@@ -89,9 +89,9 @@ suite('TextResourceConfigurationService - Update', () => {
8989
test('updateValue writes into given workspace folder target with overrides', async () => {
9090
language = 'a';
9191
configurationValue = {
92-
defaultValue: '1',
93-
userLocalValue: '2',
94-
workspaceFolderValue: '2',
92+
default: '1',
93+
userLocal: '2',
94+
workspaceFolder: '2',
9595
workspaceFolderOverridden: '1'
9696
};
9797
const resource = URI.file('someFile');
@@ -103,9 +103,9 @@ suite('TextResourceConfigurationService - Update', () => {
103103
test('updateValue writes into derived workspace folder target without overrides', async () => {
104104
language = 'a';
105105
configurationValue = {
106-
defaultValue: '1',
107-
userLocalValue: '2',
108-
workspaceFolderValue: '2',
106+
default: '1',
107+
userLocal: '2',
108+
workspaceFolder: '2',
109109
};
110110
const resource = URI.file('someFile');
111111

@@ -116,10 +116,10 @@ suite('TextResourceConfigurationService - Update', () => {
116116
test('updateValue writes into derived workspace folder target with overrides', async () => {
117117
language = 'a';
118118
configurationValue = {
119-
defaultValue: '1',
120-
userLocalValue: '2',
121-
workspaceValue: '2',
122-
workspaceFolderValue: '2',
119+
default: '1',
120+
userLocal: '2',
121+
workspace: '2',
122+
workspaceFolder: '2',
123123
workspaceOverridden: '3',
124124
workspaceFolderOverridden: '1'
125125
};
@@ -132,9 +132,9 @@ suite('TextResourceConfigurationService - Update', () => {
132132
test('updateValue writes into derived workspace target without overrides', async () => {
133133
language = 'a';
134134
configurationValue = {
135-
defaultValue: '1',
136-
userLocalValue: '2',
137-
workspaceValue: '2',
135+
default: '1',
136+
userLocal: '2',
137+
workspace: '2',
138138
};
139139
const resource = URI.file('someFile');
140140

@@ -145,9 +145,9 @@ suite('TextResourceConfigurationService - Update', () => {
145145
test('updateValue writes into derived workspace target with overrides', async () => {
146146
language = 'a';
147147
configurationValue = {
148-
defaultValue: '1',
149-
userLocalValue: '2',
150-
workspaceValue: '2',
148+
default: '1',
149+
userLocal: '2',
150+
workspace: '2',
151151
workspaceOverridden: 3
152152
};
153153
const resource = URI.file('someFile');
@@ -159,9 +159,9 @@ suite('TextResourceConfigurationService - Update', () => {
159159
test('updateValue writes into derived user remote target without overrides', async () => {
160160
language = 'a';
161161
configurationValue = {
162-
defaultValue: '1',
163-
userLocalValue: '2',
164-
userRemoteValue: '3',
162+
default: '1',
163+
userLocal: '2',
164+
userRemote: '3',
165165
};
166166
const resource = URI.file('someFile');
167167

@@ -172,9 +172,9 @@ suite('TextResourceConfigurationService - Update', () => {
172172
test('updateValue writes into derived user remote target with overrides', async () => {
173173
language = 'a';
174174
configurationValue = {
175-
defaultValue: '1',
176-
userLocalValue: '2',
177-
userRemoteValue: '3',
175+
default: '1',
176+
userLocal: '2',
177+
userRemote: '3',
178178
userRemoteOverridden: '3',
179179
};
180180
const resource = URI.file('someFile');
@@ -185,9 +185,9 @@ suite('TextResourceConfigurationService - Update', () => {
185185
test('updateValue writes into derived user remote target without overrides', async () => {
186186
language = 'a';
187187
configurationValue = {
188-
defaultValue: '1',
189-
userLocalValue: '2',
190-
userRemoteValue: '3',
188+
default: '1',
189+
userLocal: '2',
190+
userRemote: '3',
191191
};
192192
const resource = URI.file('someFile');
193193

@@ -198,9 +198,9 @@ suite('TextResourceConfigurationService - Update', () => {
198198
test('updateValue writes into derived user remote target with overrides', async () => {
199199
language = 'a';
200200
configurationValue = {
201-
defaultValue: '1',
202-
userLocalValue: '2',
203-
userRemoteValue: '3',
201+
default: '1',
202+
userLocal: '2',
203+
userRemote: '3',
204204
userRemoteOverridden: '3',
205205
};
206206
const resource = URI.file('someFile');
@@ -212,8 +212,8 @@ suite('TextResourceConfigurationService - Update', () => {
212212
test('updateValue writes into derived user target without overrides', async () => {
213213
language = 'a';
214214
configurationValue = {
215-
defaultValue: '1',
216-
userLocalValue: '2',
215+
default: '1',
216+
userLocal: '2',
217217
};
218218
const resource = URI.file('someFile');
219219

@@ -224,8 +224,8 @@ suite('TextResourceConfigurationService - Update', () => {
224224
test('updateValue writes into derived user target with overrides', async () => {
225225
language = 'a';
226226
configurationValue = {
227-
defaultValue: '1',
228-
userLocalValue: '2',
227+
default: '1',
228+
userLocal: '2',
229229
userLocalOverridden: '3'
230230
};
231231
const resource = URI.file('someFile');

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@ export interface IConfigurationChangeEvent {
6565

6666
export interface IConfigurationValue<T> {
6767

68-
readonly defaultValue?: T;
69-
readonly userValue?: T;
70-
readonly userLocalValue?: T;
71-
readonly userRemoteValue?: T;
72-
readonly workspaceValue?: T;
73-
readonly workspaceFolderValue?: T;
74-
readonly memoryValue?: T;
68+
readonly default?: T;
69+
readonly user?: T;
70+
readonly userLocal?: T;
71+
readonly userRemote?: T;
72+
readonly workspace?: T;
73+
readonly workspaceFolder?: T;
74+
readonly memory?: T;
7575
readonly value?: T;
7676

77-
readonly default?: { value?: T, override?: T };
78-
readonly user?: { value?: T, override?: T };
79-
readonly userLocal?: { value?: T, override?: T };
80-
readonly userRemote?: { value?: T, override?: T };
81-
readonly workspace?: { value?: T, override?: T };
82-
readonly workspaceFolder?: { value?: T, override?: T };
83-
readonly memory?: { value?: T, override?: T };
77+
readonly defaultTarget?: { value?: T, override?: T };
78+
readonly userTarget?: { value?: T, override?: T };
79+
readonly userLocalTarget?: { value?: T, override?: T };
80+
readonly userRemoteTarget?: { value?: T, override?: T };
81+
readonly workspaceTarget?: { value?: T, override?: T };
82+
readonly workspaceFolderTarget?: { value?: T, override?: T };
83+
readonly memoryTarget?: { value?: T, override?: T };
8484
}
8585

8686
export interface IConfigurationService {
@@ -357,11 +357,11 @@ export function getMigratedSettingValue<T>(configurationService: IConfigurationS
357357
const setting = configurationService.inspect<T>(currentSettingName);
358358
const legacySetting = configurationService.inspect<T>(legacySettingName);
359359

360-
if (typeof setting.userValue !== 'undefined' || typeof setting.workspaceValue !== 'undefined' || typeof setting.workspaceFolderValue !== 'undefined') {
360+
if (typeof setting.user !== 'undefined' || typeof setting.workspace !== 'undefined' || typeof setting.workspaceFolder !== 'undefined') {
361361
return setting.value!;
362-
} else if (typeof legacySetting.userValue !== 'undefined' || typeof legacySetting.workspaceValue !== 'undefined' || typeof legacySetting.workspaceFolderValue !== 'undefined') {
362+
} else if (typeof legacySetting.user !== 'undefined' || typeof legacySetting.workspace !== 'undefined' || typeof legacySetting.workspaceFolder !== 'undefined') {
363363
return legacySetting.value!;
364364
} else {
365-
return setting.defaultValue!;
365+
return setting.default!;
366366
}
367367
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -384,22 +384,22 @@ export class Configuration {
384384
const value = consolidateConfigurationModel.getValue<C>(key);
385385

386386
return {
387-
defaultValue,
388-
userValue,
389-
userLocalValue,
390-
userRemoteValue,
391-
workspaceValue,
392-
workspaceFolderValue,
393-
memoryValue,
387+
default: defaultValue,
388+
user: userValue,
389+
userLocal: userLocalValue,
390+
userRemote: userRemoteValue,
391+
workspace: workspaceValue,
392+
workspaceFolder: workspaceFolderValue,
393+
memory: memoryValue,
394394
value,
395395

396-
default: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
397-
user: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
398-
userLocal: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
399-
userRemote: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
400-
workspace: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
401-
workspaceFolder: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
402-
memory: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
396+
defaultTarget: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
397+
userTarget: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
398+
userLocalTarget: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
399+
userRemoteTarget: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
400+
workspaceTarget: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
401+
workspaceFolderTarget: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
402+
memoryTarget: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
403403
};
404404
}
405405

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export class TestConfigurationService implements IConfigurationService {
6060

6161
return {
6262
value: getConfigurationValue<T>(config, key),
63-
defaultValue: getConfigurationValue<T>(config, key),
64-
userValue: getConfigurationValue<T>(config, key)
63+
default: getConfigurationValue<T>(config, key),
64+
user: getConfigurationValue<T>(config, key)
6565
};
6666
}
6767

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ export class ExtHostConfigProvider {
204204
if (config) {
205205
return {
206206
key,
207-
defaultValue: config.defaultValue,
208-
globalValue: config.userValue,
209-
workspaceValue: config.workspaceValue,
210-
workspaceFolderValue: config.workspaceFolderValue
207+
defaultValue: config.default,
208+
globalValue: config.user,
209+
workspaceValue: config.workspace,
210+
workspaceFolderValue: config.workspaceFolder
211211
};
212212
}
213213
return undefined;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,12 +1158,12 @@ export class ChangeModeAction extends Action {
11581158

11591159
// If the association is already being made in the workspace, make sure to target workspace settings
11601160
let target = ConfigurationTarget.USER;
1161-
if (fileAssociationsConfig.workspaceValue && !!(fileAssociationsConfig.workspaceValue as any)[associationKey]) {
1161+
if (fileAssociationsConfig.workspace && !!(fileAssociationsConfig.workspace as any)[associationKey]) {
11621162
target = ConfigurationTarget.WORKSPACE;
11631163
}
11641164

11651165
// Make sure to write into the value of the target and not the merged value from USER and WORKSPACE config
1166-
const currentAssociations = deepClone((target === ConfigurationTarget.WORKSPACE) ? fileAssociationsConfig.workspaceValue : fileAssociationsConfig.userValue) || Object.create(null);
1166+
const currentAssociations = deepClone((target === ConfigurationTarget.WORKSPACE) ? fileAssociationsConfig.workspace : fileAssociationsConfig.user) || Object.create(null);
11671167
currentAssociations[associationKey] = language.id;
11681168

11691169
this.configurationService.updateValue(FILES_ASSOCIATIONS_CONFIG, currentAssociations, target);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ class Launch extends AbstractLaunch implements ILaunch {
551551
}
552552

553553
protected getConfig(): IGlobalConfig | undefined {
554-
return this.configurationService.inspect<IGlobalConfig>('launch', { resource: this.workspace.uri }).workspaceFolderValue;
554+
return this.configurationService.inspect<IGlobalConfig>('launch', { resource: this.workspace.uri }).workspaceFolder;
555555
}
556556

557557
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 {
631631
}
632632

633633
protected getConfig(): IGlobalConfig | undefined {
634-
return this.configurationService.inspect<IGlobalConfig>('launch').workspaceValue;
634+
return this.configurationService.inspect<IGlobalConfig>('launch').workspace;
635635
}
636636

637637
async openConfigFile(sideBySide: boolean, preserveFocus: boolean): Promise<{ editor: IEditor | null, created: boolean }> {
@@ -674,7 +674,7 @@ class UserLaunch extends AbstractLaunch implements ILaunch {
674674
}
675675

676676
protected getConfig(): IGlobalConfig | undefined {
677-
return this.configurationService.inspect<IGlobalConfig>('launch').userValue;
677+
return this.configurationService.inspect<IGlobalConfig>('launch').user;
678678
}
679679

680680
async openConfigFile(_: boolean, preserveFocus: boolean): Promise<{ editor: IEditor | null, created: boolean }> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,7 +1379,7 @@ export class SetColorThemeAction extends ExtensionAction {
13791379
ignoreFocusLost
13801380
});
13811381
let confValue = this.configurationService.inspect(COLOR_THEME_SETTING);
1382-
const target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
1382+
const target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
13831383
return this.workbenchThemeService.setColorTheme(pickedTheme ? pickedTheme.id : currentTheme.id, target);
13841384
}
13851385
}
@@ -1445,7 +1445,7 @@ export class SetFileIconThemeAction extends ExtensionAction {
14451445
ignoreFocusLost
14461446
});
14471447
let confValue = this.configurationService.inspect(ICON_THEME_SETTING);
1448-
const target = typeof confValue.workspaceValue !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
1448+
const target = typeof confValue.workspace !== 'undefined' ? ConfigurationTarget.WORKSPACE : ConfigurationTarget.USER;
14491449
return this.workbenchThemeService.setFileIconTheme(pickedTheme ? pickedTheme.id : currentTheme.id, target);
14501450
}
14511451
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ export class SettingsEditor2 extends BaseEditor {
799799

800800
// If the user is changing the value back to the default, do a 'reset' instead
801801
const inspected = this.configurationService.inspect(key, overrides);
802-
if (inspected.defaultValue === value) {
802+
if (inspected.default === value) {
803803
value = undefined;
804804
}
805805

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,23 +155,23 @@ export class SettingsTreeSettingElement extends SettingsTreeElement {
155155
update(inspectResult: IInspectResult): void {
156156
const { isConfigured, inspected, targetSelector } = inspectResult;
157157

158-
const displayValue = isConfigured ? inspected[targetSelector] : inspected.defaultValue;
158+
const displayValue = isConfigured ? inspected[targetSelector] : inspected.default;
159159
const overriddenScopeList: string[] = [];
160-
if (targetSelector !== 'workspace' && typeof inspected.workspaceValue !== 'undefined') {
160+
if (targetSelector !== 'workspace' && typeof inspected.workspace !== 'undefined') {
161161
overriddenScopeList.push(localize('workspace', "Workspace"));
162162
}
163163

164-
if (targetSelector !== 'userRemote' && typeof inspected.userRemoteValue !== 'undefined') {
164+
if (targetSelector !== 'userRemote' && typeof inspected.userRemote !== 'undefined') {
165165
overriddenScopeList.push(localize('remote', "Remote"));
166166
}
167167

168-
if (targetSelector !== 'userLocal' && typeof inspected.userLocalValue !== 'undefined') {
168+
if (targetSelector !== 'userLocal' && typeof inspected.userLocal !== 'undefined') {
169169
overriddenScopeList.push(localize('user', "User"));
170170
}
171171

172172
this.value = displayValue;
173173
this.scopeValue = isConfigured && inspected[targetSelector];
174-
this.defaultValue = inspected.defaultValue;
174+
this.defaultValue = inspected.default;
175175

176176
this.isConfigured = isConfigured;
177177
if (isConfigured || this.setting.tags || this.tags) {

0 commit comments

Comments
 (0)