microsoft#51935 fix overrides keys in configuration model while merging

sandy081 · sandy081 · commit de269bbbf2bb · 2021-11-15T17:32:34.000+01:00
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
@@ -89,6 +89,8 @@ export class ConfigurationModel implements IConfigurationModel {
 				const [override] = overrides.filter(o => arrays.equals(o.identifiers, otherOverride.identifiers));
 				if (override) {
 					this.mergeContents(override.contents, otherOverride.contents);
+					override.keys.push(...otherOverride.keys);
+					override.keys = arrays.distinct(override.keys);
 				} else {
 					overrides.push(objects.deepClone(otherOverride));
 				}
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -190,7 +190,7 @@ suite('ConfigurationModel', () => {
 		let result = base.merge(add);
 
 		assert.deepStrictEqual(result.contents, { 'a': { 'b': 2 } });
-		assert.deepStrictEqual(result.overrides, [{ identifiers: ['c'], contents: { 'a': 2, 'b': 2 }, keys: ['a'] }]);
+		assert.deepStrictEqual(result.overrides, [{ identifiers: ['c'], contents: { 'a': 2, 'b': 2 }, keys: ['a', 'b'] }]);
 		assert.deepStrictEqual(result.override('c').contents, { 'a': 2, 'b': 2 });
 		assert.deepStrictEqual(result.keys, ['a.b']);
 	});
@@ -260,6 +260,21 @@ suite('ConfigurationModel', () => {
 
 		assert.deepStrictEqual(testObject.getKeysForOverrideIdentifier('x'), ['a', 'b']);
 	});
+
+	test('Test merge when configuration models have multiple identifiers', () => {
+		const testObject = new ConfigurationModel({ 'a': 1, 'c': 1 }, ['a', 'c'], [{ identifiers: ['y'], contents: { 'c': 1 }, keys: ['c'] }, { identifiers: ['x', 'y'], contents: { 'a': 2 }, keys: ['a'] }]);
+		const target = new ConfigurationModel({ 'a': 2, 'b': 1 }, ['a', 'b'], [{ identifiers: ['x'], contents: { 'a': 3, 'b': 2 }, keys: ['a', 'b'] }, { identifiers: ['x', 'y'], contents: { 'b': 3 }, keys: ['b'] }]);
+
+		const actual = testObject.merge(target);
+
+		assert.deepStrictEqual(actual.contents, { 'a': 2, 'c': 1, 'b': 1 });
+		assert.deepStrictEqual(actual.keys, ['a', 'c', 'b']);
+		assert.deepStrictEqual(actual.overrides, [
+			{ identifiers: ['y'], contents: { 'c': 1 }, keys: ['c'] },
+			{ identifiers: ['x', 'y'], contents: { 'a': 2, 'b': 3 }, keys: ['a', 'b'] },
+			{ identifiers: ['x'], contents: { 'a': 3, 'b': 2 }, keys: ['a', 'b'] },
+		]);
+	});
 });
 
 suite('CustomConfigurationModel', () => {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ export class ConfigurationModel implements IConfigurationModel {`
`89`	`89`	`const [override] = overrides.filter(o => arrays.equals(o.identifiers, otherOverride.identifiers));`
`90`	`90`	`if (override) {`
`91`	`91`	`this.mergeContents(override.contents, otherOverride.contents);`
	`92`	`+ override.keys.push(...otherOverride.keys);`
	`93`	`+ override.keys = arrays.distinct(override.keys);`
`92`	`94`	`} else {`
`93`	`95`	`overrides.push(objects.deepClone(otherOverride));`
`94`	`96`	`}`