development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

#51935 fix configuration model to consider an override identifier can exists in more than one overrides

Browse source
This commit is contained in:
Sandeep Somavarapu 2021-11-15 17:10:19 +01:00
parent 466d0418a2
commit bdc489b38d
No known key found for this signature in database
GPG key ID: 1FED25EC4646638B
2 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/vs/platform/configuration/common/configurationModels.ts
View file

@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as arrays from 'vs/base/common/arrays';
import { IStringDictionary } from 'vs/base/common/collections';
import { Emitter, Event } from 'vs/base/common/event';
import * as json from 'vs/base/common/json';
import { Disposable } from 'vs/base/common/lifecycle';
@ -58,12 +59,13 @@ export class ConfigurationModel implements IConfigurationModel {
}
getKeysForOverrideIdentifier(identifier: string): string[] {
const keys: string[] = [];
for (const override of this.overrides) {
if (override.identifiers.indexOf(identifier) !== -1) {
return override.keys;
if (override.identifiers.includes(identifier)) {
keys.push(...override.keys);
}
}
return [];
return arrays.distinct(keys);
}
override(identifier: string): ConfigurationModel {
@ -156,12 +158,27 @@ export class ConfigurationModel implements IConfigurationModel {
}
private getContentsForOverrideIdentifer(identifier: string): any {
let contentsForIdentifierOnly: IStringDictionary<any> | null = null;
let contents: IStringDictionary<any> | null = null;
const mergeContents = (contentsToMerge: any) => {
if (contentsToMerge) {
if (contents) {
this.mergeContents(contents, contentsToMerge);
} else {
contents = contentsToMerge;
}
}
};
for (const override of this.overrides) {
if (override.identifiers.indexOf(identifier) !== -1) {
return override.contents;
if (arrays.equals(override.identifiers, [identifier])) {
contentsForIdentifierOnly = override.contents;
} else if (override.identifiers.includes(identifier)) {
mergeContents(override.contents);
}
}
return null;
// Merge contents of the identifier only at the end to take precedence.
mergeContents(contentsForIdentifierOnly);
return contents;
}
toJSON(): IConfigurationModel {

24
src/vs/platform/configuration/test/common/configurationModels.test.ts
View file

@ -236,6 +236,30 @@ suite('ConfigurationModel', () => {
assert.deepStrictEqual(testObject.override('b').contents, { 'a': 2, 'c': 1 });
});
test('Test override when an override has multiple identifiers', () => {
const testObject = new ConfigurationModel({ 'a': 1, 'c': 1 }, ['a', 'c'], [{ identifiers: ['x', 'y'], contents: { 'a': 2 }, keys: ['a'] }]);
let actual = testObject.override('x');
assert.deepStrictEqual(actual.contents, { 'a': 2, 'c': 1 });
assert.deepStrictEqual(actual.keys, ['a', 'c']);
assert.deepStrictEqual(testObject.getKeysForOverrideIdentifier('x'), ['a']);
actual = testObject.override('y');
assert.deepStrictEqual(actual.contents, { 'a': 2, 'c': 1 });
assert.deepStrictEqual(actual.keys, ['a', 'c']);
assert.deepStrictEqual(testObject.getKeysForOverrideIdentifier('y'), ['a']);
});
test('Test override when an identifier is defined in multiple overrides', () => {
const testObject = new ConfigurationModel({ 'a': 1, 'c': 1 }, ['a', 'c'], [{ identifiers: ['x'], contents: { 'a': 3, 'b': 1 }, keys: ['a', 'b'] }, { identifiers: ['x', 'y'], contents: { 'a': 2 }, keys: ['a'] }]);
const actual = testObject.override('x');
assert.deepStrictEqual(actual.contents, { 'a': 3, 'c': 1, 'b': 1 });
assert.deepStrictEqual(actual.keys, ['a', 'c']);
assert.deepStrictEqual(testObject.getKeysForOverrideIdentifier('x'), ['a', 'b']);
});
});
suite('CustomConfigurationModel', () => {