Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-06 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #211148 (#211319)

Browse Source
This commit is contained in:
Sandeep Somavarapu
2024-04-25 11:01:12 +02:00
committed by GitHub
parent dee7ada658
commit d7b54f7b04
2 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/common/services/textResourceConfigurationService.ts
+2 -20
View File
@@ -43,26 +43,8 @@ export class TextResourceConfigurationService extends Disposable implements ITex
if (configurationTarget === undefined) {
configurationTarget = this.deriveConfigurationTarget(configurationValue, language);
}
switch (configurationTarget) {
case ConfigurationTarget.MEMORY:
return this._updateValue(key, value, configurationTarget, configurationValue.memory?.override, resource, language);
case ConfigurationTarget.WORKSPACE_FOLDER:
return this._updateValue(key, value, configurationTarget, configurationValue.workspaceFolder?.override, resource, language);
case ConfigurationTarget.WORKSPACE:
return this._updateValue(key, value, configurationTarget, configurationValue.workspace?.override, resource, language);
case ConfigurationTarget.USER_REMOTE:
return this._updateValue(key, value, configurationTarget, configurationValue.userRemote?.override, resource, language);
default:
return this._updateValue(key, value, configurationTarget, configurationValue.userLocal?.override, resource, language);
}
}
private _updateValue(key: string, value: any, configurationTarget: ConfigurationTarget, overriddenValue: any | undefined, resource: URI, language: string | null): Promise<void> {
if (language && overriddenValue !== undefined) {
return this.configurationService.updateValue(key, value, { resource, overrideIdentifier: language }, configurationTarget);
} else {
return this.configurationService.updateValue(key, value, { resource }, configurationTarget);
}
const overrideIdentifier = language && configurationValue.overrideIdentifiers?.includes(language) ? language : undefined;
return this.configurationService.updateValue(key, value, { resource, overrideIdentifier }, configurationTarget);
}
private deriveConfigurationTarget(configurationValue: IConfigurationValue<any>, language: string | null): ConfigurationTarget {
src/vs/editor/test/common/services/textResourceConfigurationService.test.ts
+39 -15
View File
@@ -44,13 +44,13 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes without target and overrides when no language is defined', async () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER_LOCAL]);
});
test('updateValue writes with target and without overrides when no language is defined', async () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER_LOCAL);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER_LOCAL]);
});
test('updateValue writes into given memory target without overrides', async () => {
@@ -63,7 +63,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.MEMORY);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.MEMORY]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.MEMORY]);
});
test('updateValue writes into given workspace target without overrides', async () => {
@@ -76,7 +76,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.WORKSPACE);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.WORKSPACE]);
});
test('updateValue writes into given user target without overrides', async () => {
@@ -89,7 +89,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER]);
});
test('updateValue writes into given workspace folder target with overrides', async () => {
@@ -98,6 +98,7 @@ suite('TextResourceConfigurationService - Update', () => {
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2', override: '1' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -115,7 +116,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE_FOLDER]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.WORKSPACE_FOLDER]);
});
test('updateValue writes into derived workspace folder target with overrides', async () => {
@@ -125,6 +126,7 @@ suite('TextResourceConfigurationService - Update', () => {
userLocal: { value: '2' },
workspace: { value: '2', override: '1' },
workspaceFolder: { value: '2', override: '2' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -142,7 +144,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.WORKSPACE]);
});
test('updateValue writes into derived workspace target with overrides', async () => {
@@ -151,6 +153,7 @@ suite('TextResourceConfigurationService - Update', () => {
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -165,6 +168,7 @@ suite('TextResourceConfigurationService - Update', () => {
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
workspaceFolder: { value: '2' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -182,7 +186,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_REMOTE]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER_REMOTE]);
});
test('updateValue writes into derived user remote target with overrides', async () => {
@@ -191,6 +195,7 @@ suite('TextResourceConfigurationService - Update', () => {
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -204,7 +209,8 @@ suite('TextResourceConfigurationService - Update', () => {
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' }
workspace: { value: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -219,7 +225,8 @@ suite('TextResourceConfigurationService - Update', () => {
userLocal: { value: '2', override: '1' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' },
workspaceFolder: { value: '3' }
workspaceFolder: { value: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -236,7 +243,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER_LOCAL]);
});
test('updateValue writes into derived user target with overrides', async () => {
@@ -244,6 +251,7 @@ suite('TextResourceConfigurationService - Update', () => {
configurationValue = {
default: { value: '1' },
userLocal: { value: '2', override: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -256,7 +264,8 @@ suite('TextResourceConfigurationService - Update', () => {
configurationValue = {
default: { value: '1' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' }
userRemote: { value: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -269,7 +278,8 @@ suite('TextResourceConfigurationService - Update', () => {
configurationValue = {
default: { value: '1' },
userLocal: { value: '2', override: '3' },
workspaceValue: { value: '3' }
workspaceValue: { value: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -283,7 +293,21 @@ suite('TextResourceConfigurationService - Update', () => {
default: { value: '1', override: '3' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' },
workspaceFolderValue: { value: '3' }
workspaceFolderValue: { value: '3' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', '2');
assert.deepStrictEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
});
test('updateValue writes into derived user target when overridden in default and not in user', async () => {
language = 'a';
configurationValue = {
default: { value: '1', override: '3' },
userLocal: { value: '2' },
overrideIdentifiers: [language]
};
const resource = URI.file('someFile');
@@ -299,7 +323,7 @@ suite('TextResourceConfigurationService - Update', () => {
const resource = URI.file('someFile');
await testObject.updateValue(resource, 'a', 'b');
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
assert.deepStrictEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: undefined }, ConfigurationTarget.USER_LOCAL]);
});
});