Skip to content

Commit c71fa38

Browse files
sandy081sandy081
committed
rename
1 parent 4cdb067 commit c71fa38

5 files changed

Lines changed: 90 additions & 90 deletions

File tree

‎src/vs/editor/common/services/resourceConfigurationImpl.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ export class TextResourceConfigurationService extends Disposable implements IRes
4545
}
4646
switch (configurationTarget) {
4747
case ConfigurationTarget.MEMORY:
48-
return this._updateValue(key, value, configurationTarget, configurationValue.memoryTarget?.override, resource, language);
48+
return this._updateValue(key, value, configurationTarget, configurationValue.memory?.override, resource, language);
4949
case ConfigurationTarget.WORKSPACE_FOLDER:
50-
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolderTarget?.override, resource, language);
50+
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolder?.override, resource, language);
5151
case ConfigurationTarget.WORKSPACE:
52-
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceTarget?.override, resource, language);
52+
return this._updateValue(key, value, configurationTarget, configurationValue.workspace?.override, resource, language);
5353
case ConfigurationTarget.USER_REMOTE:
54-
return this._updateValue(key, value, configurationTarget, configurationValue.userRemoteTarget?.override, resource, language);
54+
return this._updateValue(key, value, configurationTarget, configurationValue.userRemote?.override, resource, language);
5555
default:
56-
return this._updateValue(key, value, configurationTarget, configurationValue.userLocalTarget?.override, resource, language);
56+
return this._updateValue(key, value, configurationTarget, configurationValue.userLocal?.override, resource, language);
5757
}
5858
}
5959

@@ -67,32 +67,32 @@ export class TextResourceConfigurationService extends Disposable implements IRes
6767

6868
private deriveConfigurationTarget(configurationValue: IConfigurationValue<any>, language: string | null): ConfigurationTarget {
6969
if (language) {
70-
if (configurationValue.memoryTarget?.override !== undefined) {
70+
if (configurationValue.memory?.override !== undefined) {
7171
return ConfigurationTarget.MEMORY;
7272
}
73-
if (configurationValue.workspaceFolderTarget?.override !== undefined) {
73+
if (configurationValue.workspaceFolder?.override !== undefined) {
7474
return ConfigurationTarget.WORKSPACE_FOLDER;
7575
}
76-
if (configurationValue.workspaceTarget?.override !== undefined) {
76+
if (configurationValue.workspace?.override !== undefined) {
7777
return ConfigurationTarget.WORKSPACE;
7878
}
79-
if (configurationValue.userRemoteTarget?.override !== undefined) {
79+
if (configurationValue.userRemote?.override !== undefined) {
8080
return ConfigurationTarget.USER_REMOTE;
8181
}
82-
if (configurationValue.userLocalTarget?.override !== undefined) {
82+
if (configurationValue.userLocal?.override !== undefined) {
8383
return ConfigurationTarget.USER_LOCAL;
8484
}
8585
}
86-
if (configurationValue.memoryTarget?.value !== undefined) {
86+
if (configurationValue.memory?.value !== undefined) {
8787
return ConfigurationTarget.MEMORY;
8888
}
89-
if (configurationValue.workspaceFolderTarget?.value !== undefined) {
89+
if (configurationValue.workspaceFolder?.value !== undefined) {
9090
return ConfigurationTarget.WORKSPACE_FOLDER;
9191
}
92-
if (configurationValue.workspaceTarget?.value !== undefined) {
92+
if (configurationValue.workspace?.value !== undefined) {
9393
return ConfigurationTarget.WORKSPACE;
9494
}
95-
if (configurationValue.userRemoteTarget?.value !== undefined) {
95+
if (configurationValue.userRemote?.value !== undefined) {
9696
return ConfigurationTarget.USER_REMOTE;
9797
}
9898
return ConfigurationTarget.USER_LOCAL;

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

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ suite('TextResourceConfigurationService - Update', () => {
5252
test('updateValue writes into given memory target without overrides', async () => {
5353
language = 'a';
5454
configurationValue = {
55-
defaultTarget: { value: '1' },
56-
userLocalTarget: { value: '2' },
57-
workspaceFolderTarget: { value: '1' },
55+
default: { value: '1' },
56+
userLocal: { value: '2' },
57+
workspaceFolder: { value: '1' },
5858
};
5959
const resource = URI.file('someFile');
6060

@@ -65,9 +65,9 @@ suite('TextResourceConfigurationService - Update', () => {
6565
test('updateValue writes into given workspace target without overrides', async () => {
6666
language = 'a';
6767
configurationValue = {
68-
defaultTarget: { value: '1' },
69-
userLocalTarget: { value: '2' },
70-
workspaceFolderTarget: { value: '2' },
68+
default: { value: '1' },
69+
userLocal: { value: '2' },
70+
workspaceFolder: { value: '2' },
7171
};
7272
const resource = URI.file('someFile');
7373

@@ -78,9 +78,9 @@ suite('TextResourceConfigurationService - Update', () => {
7878
test('updateValue writes into given user target without overrides', async () => {
7979
language = 'a';
8080
configurationValue = {
81-
defaultTarget: { value: '1' },
82-
userLocalTarget: { value: '2' },
83-
workspaceFolderTarget: { value: '2' },
81+
default: { value: '1' },
82+
userLocal: { value: '2' },
83+
workspaceFolder: { value: '2' },
8484
};
8585
const resource = URI.file('someFile');
8686

@@ -91,9 +91,9 @@ suite('TextResourceConfigurationService - Update', () => {
9191
test('updateValue writes into given workspace folder target with overrides', async () => {
9292
language = 'a';
9393
configurationValue = {
94-
defaultTarget: { value: '1' },
95-
userLocalTarget: { value: '2' },
96-
workspaceFolderTarget: { value: '2', override: '1' },
94+
default: { value: '1' },
95+
userLocal: { value: '2' },
96+
workspaceFolder: { value: '2', override: '1' },
9797
};
9898
const resource = URI.file('someFile');
9999

@@ -104,9 +104,9 @@ suite('TextResourceConfigurationService - Update', () => {
104104
test('updateValue writes into derived workspace folder target without overrides', async () => {
105105
language = 'a';
106106
configurationValue = {
107-
defaultTarget: { value: '1' },
108-
userLocalTarget: { value: '2' },
109-
workspaceFolderTarget: { value: '2' },
107+
default: { value: '1' },
108+
userLocal: { value: '2' },
109+
workspaceFolder: { value: '2' },
110110
};
111111
const resource = URI.file('someFile');
112112

@@ -117,10 +117,10 @@ suite('TextResourceConfigurationService - Update', () => {
117117
test('updateValue writes into derived workspace folder target with overrides', async () => {
118118
language = 'a';
119119
configurationValue = {
120-
defaultTarget: { value: '1' },
121-
userLocalTarget: { value: '2' },
122-
workspaceTarget: { value: '2', override: '1' },
123-
workspaceFolderTarget: { value: '2', override: '2' },
120+
default: { value: '1' },
121+
userLocal: { value: '2' },
122+
workspace: { value: '2', override: '1' },
123+
workspaceFolder: { value: '2', override: '2' },
124124
};
125125
const resource = URI.file('someFile');
126126

@@ -131,9 +131,9 @@ suite('TextResourceConfigurationService - Update', () => {
131131
test('updateValue writes into derived workspace target without overrides', async () => {
132132
language = 'a';
133133
configurationValue = {
134-
defaultTarget: { value: '1' },
135-
userLocalTarget: { value: '2' },
136-
workspaceTarget: { value: '2' },
134+
default: { value: '1' },
135+
userLocal: { value: '2' },
136+
workspace: { value: '2' },
137137
};
138138
const resource = URI.file('someFile');
139139

@@ -144,9 +144,9 @@ suite('TextResourceConfigurationService - Update', () => {
144144
test('updateValue writes into derived workspace target with overrides', async () => {
145145
language = 'a';
146146
configurationValue = {
147-
defaultTarget: { value: '1' },
148-
userLocalTarget: { value: '2' },
149-
workspaceTarget: { value: '2', override: '2' },
147+
default: { value: '1' },
148+
userLocal: { value: '2' },
149+
workspace: { value: '2', override: '2' },
150150
};
151151
const resource = URI.file('someFile');
152152

@@ -157,10 +157,10 @@ suite('TextResourceConfigurationService - Update', () => {
157157
test('updateValue writes into derived workspace target with overrides and value defined in folder', async () => {
158158
language = 'a';
159159
configurationValue = {
160-
defaultTarget: { value: '1', override: '3' },
161-
userLocalTarget: { value: '2' },
162-
workspaceTarget: { value: '2', override: '2' },
163-
workspaceFolderTarget: { value: '2' },
160+
default: { value: '1', override: '3' },
161+
userLocal: { value: '2' },
162+
workspace: { value: '2', override: '2' },
163+
workspaceFolder: { value: '2' },
164164
};
165165
const resource = URI.file('someFile');
166166

@@ -171,9 +171,9 @@ suite('TextResourceConfigurationService - Update', () => {
171171
test('updateValue writes into derived user remote target without overrides', async () => {
172172
language = 'a';
173173
configurationValue = {
174-
defaultTarget: { value: '1' },
175-
userLocalTarget: { value: '2' },
176-
userRemoteTarget: { value: '2' },
174+
default: { value: '1' },
175+
userLocal: { value: '2' },
176+
userRemote: { value: '2' },
177177
};
178178
const resource = URI.file('someFile');
179179

@@ -184,9 +184,9 @@ suite('TextResourceConfigurationService - Update', () => {
184184
test('updateValue writes into derived user remote target with overrides', async () => {
185185
language = 'a';
186186
configurationValue = {
187-
defaultTarget: { value: '1' },
188-
userLocalTarget: { value: '2' },
189-
userRemoteTarget: { value: '2', override: '3' },
187+
default: { value: '1' },
188+
userLocal: { value: '2' },
189+
userRemote: { value: '2', override: '3' },
190190
};
191191
const resource = URI.file('someFile');
192192

@@ -197,10 +197,10 @@ suite('TextResourceConfigurationService - Update', () => {
197197
test('updateValue writes into derived user remote target with overrides and value defined in workspace', async () => {
198198
language = 'a';
199199
configurationValue = {
200-
defaultTarget: { value: '1' },
201-
userLocalTarget: { value: '2' },
202-
userRemoteTarget: { value: '2', override: '3' },
203-
workspaceTarget: { value: '3' }
200+
default: { value: '1' },
201+
userLocal: { value: '2' },
202+
userRemote: { value: '2', override: '3' },
203+
workspace: { value: '3' }
204204
};
205205
const resource = URI.file('someFile');
206206

@@ -211,11 +211,11 @@ suite('TextResourceConfigurationService - Update', () => {
211211
test('updateValue writes into derived user remote target with overrides and value defined in workspace folder', async () => {
212212
language = 'a';
213213
configurationValue = {
214-
defaultTarget: { value: '1' },
215-
userLocalTarget: { value: '2', override: '1' },
216-
userRemoteTarget: { value: '2', override: '3' },
217-
workspaceTarget: { value: '3' },
218-
workspaceFolderTarget: { value: '3' }
214+
default: { value: '1' },
215+
userLocal: { value: '2', override: '1' },
216+
userRemote: { value: '2', override: '3' },
217+
workspace: { value: '3' },
218+
workspaceFolder: { value: '3' }
219219
};
220220
const resource = URI.file('someFile');
221221

@@ -226,8 +226,8 @@ suite('TextResourceConfigurationService - Update', () => {
226226
test('updateValue writes into derived user target without overrides', async () => {
227227
language = 'a';
228228
configurationValue = {
229-
defaultTarget: { value: '1' },
230-
userLocalTarget: { value: '2' },
229+
default: { value: '1' },
230+
userLocal: { value: '2' },
231231
};
232232
const resource = URI.file('someFile');
233233

@@ -238,8 +238,8 @@ suite('TextResourceConfigurationService - Update', () => {
238238
test('updateValue writes into derived user target with overrides', async () => {
239239
language = 'a';
240240
configurationValue = {
241-
defaultTarget: { value: '1' },
242-
userLocalTarget: { value: '2', override: '3' },
241+
default: { value: '1' },
242+
userLocal: { value: '2', override: '3' },
243243
};
244244
const resource = URI.file('someFile');
245245

@@ -250,9 +250,9 @@ suite('TextResourceConfigurationService - Update', () => {
250250
test('updateValue writes into derived user target with overrides and value is defined in remote', async () => {
251251
language = 'a';
252252
configurationValue = {
253-
defaultTarget: { value: '1' },
254-
userLocalTarget: { value: '2', override: '3' },
255-
userRemoteTarget: { value: '3' }
253+
default: { value: '1' },
254+
userLocal: { value: '2', override: '3' },
255+
userRemote: { value: '3' }
256256
};
257257
const resource = URI.file('someFile');
258258

@@ -263,8 +263,8 @@ suite('TextResourceConfigurationService - Update', () => {
263263
test('updateValue writes into derived user target with overrides and value is defined in workspace', async () => {
264264
language = 'a';
265265
configurationValue = {
266-
defaultTarget: { value: '1' },
267-
userLocalTarget: { value: '2', override: '3' },
266+
default: { value: '1' },
267+
userLocal: { value: '2', override: '3' },
268268
workspaceValue: { value: '3' }
269269
};
270270
const resource = URI.file('someFile');
@@ -276,9 +276,9 @@ suite('TextResourceConfigurationService - Update', () => {
276276
test('updateValue writes into derived user target with overrides and value is defined in workspace folder', async () => {
277277
language = 'a';
278278
configurationValue = {
279-
defaultTarget: { value: '1', override: '3' },
280-
userLocalTarget: { value: '2', override: '3' },
281-
userRemoteTarget: { value: '3' },
279+
default: { value: '1', override: '3' },
280+
userLocal: { value: '2', override: '3' },
281+
userRemote: { value: '3' },
282282
workspaceFolderValue: { value: '3' }
283283
};
284284
const resource = URI.file('someFile');
@@ -290,7 +290,7 @@ suite('TextResourceConfigurationService - Update', () => {
290290
test('updateValue when not changed', async () => {
291291
language = 'a';
292292
configurationValue = {
293-
defaultTarget: { value: '1' },
293+
default: { value: '1' },
294294
};
295295
const resource = URI.file('someFile');
296296

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ export interface IConfigurationValue<T> {
7676
readonly memoryValue?: T;
7777
readonly value?: T;
7878

79-
readonly defaultTarget?: { value?: T, override?: T };
80-
readonly userTarget?: { value?: T, override?: T };
81-
readonly userLocalTarget?: { value?: T, override?: T };
82-
readonly userRemoteTarget?: { value?: T, override?: T };
83-
readonly workspaceTarget?: { value?: T, override?: T };
84-
readonly workspaceFolderTarget?: { value?: T, override?: T };
85-
readonly memoryTarget?: { value?: T, override?: T };
79+
readonly default?: { value?: T, override?: T };
80+
readonly user?: { value?: T, override?: T };
81+
readonly userLocal?: { value?: T, override?: T };
82+
readonly userRemote?: { value?: T, override?: T };
83+
readonly workspace?: { value?: T, override?: T };
84+
readonly workspaceFolder?: { value?: T, override?: T };
85+
readonly memory?: { value?: T, override?: T };
8686
}
8787

8888
export interface IConfigurationService {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ export class Configuration {
402402
memoryValue: memoryValue,
403403
value,
404404

405-
defaultTarget: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
406-
userTarget: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
407-
userLocalTarget: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
408-
userRemoteTarget: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
409-
workspaceTarget: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
410-
workspaceFolderTarget: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
411-
memoryTarget: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
405+
default: defaultValue !== undefined ? { value: this._defaultConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._defaultConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
406+
user: userValue !== undefined ? { value: this.userConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.userConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
407+
userLocal: userLocalValue !== undefined ? { value: this.localUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.localUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
408+
userRemote: userRemoteValue !== undefined ? { value: this.remoteUserConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this.remoteUserConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
409+
workspace: workspaceValue !== undefined ? { value: this._workspaceConfiguration.freeze().getValue(key), override: overrides.overrideIdentifier ? this._workspaceConfiguration.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
410+
workspaceFolder: workspaceFolderValue !== undefined ? { value: folderConfigurationModel?.freeze().getValue(key), override: overrides.overrideIdentifier ? folderConfigurationModel?.freeze().getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
411+
memory: memoryValue !== undefined ? { value: memoryConfigurationModel.getValue(key), override: overrides.overrideIdentifier ? memoryConfigurationModel.getOverrideValue(key, overrides.overrideIdentifier) : undefined } : undefined,
412412
};
413413
}
414414

0 commit comments

Comments
 (0)