Fix microsoft#45536

sandy081 · sandy081 · commit ce8a0831d97e · 2018-03-13T14:11:59.000+05:30
diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts
@@ -85,7 +85,7 @@ export class ConfigurationModel implements IConfigurationModel {
 				if (override) {
 					this.mergeContents(override.contents, otherOverride.contents);
 				} else {
-					overrides.push(otherOverride);
+					overrides.push(objects.deepClone(otherOverride));
 				}
 			}
 			for (const key of other.keys) {
diff --git a/src/vs/platform/configuration/test/common/configurationModels.test.ts b/src/vs/platform/configuration/test/common/configurationModels.test.ts
@@ -199,6 +199,17 @@ suite('ConfigurationModel', () => {
 		assert.deepEqual(result.keys, ['a.b', 'f']);
 	});
 
+	test('merge overrides when frozen', () => {
+		let model1 = new ConfigurationModel({ 'a': { 'b': 1 }, 'f': 1 }, ['a.b', 'f'], [{ identifiers: ['c'], contents: { 'a': { 'd': 1 } } }]).freeze();
+		let model2 = new ConfigurationModel({ 'a': { 'b': 2 } }, ['a.b'], [{ identifiers: ['c'], contents: { 'a': { 'e': 2 } } }]).freeze();
+		let result = new ConfigurationModel().merge(model1, model2);
+
+		assert.deepEqual(result.contents, { 'a': { 'b': 2 }, 'f': 1 });
+		assert.deepEqual(result.overrides, [{ identifiers: ['c'], contents: { 'a': { 'd': 1, 'e': 2 } } }]);
+		assert.deepEqual(result.override('c').contents, { 'a': { 'b': 2, 'd': 1, 'e': 2 }, 'f': 1 });
+		assert.deepEqual(result.keys, ['a.b', 'f']);
+	});
+
 	test('Test contents while getting an existing property', () => {
 		let testObject = new ConfigurationModel({ 'a': 1 });
 		assert.deepEqual(testObject.getValue('a'), 1);
@@ -349,24 +360,6 @@ suite('CustomConfigurationModel', () => {
 		});
 		assert.equal(true, new DefaultConfigurationModel().getValue('a'));
 	});
-
-	test('Test registering the language property', () => {
-		Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
-			'id': '[a]',
-			'order': 1,
-			'title': 'a',
-			'type': 'object',
-			'properties': {
-				'[a]': {
-					'description': 'a',
-					'type': 'boolean',
-					'default': false,
-				}
-			}
-		});
-		assert.equal(undefined, new DefaultConfigurationModel().getValue('[a]'));
-	});
-
 });
 
 suite('ConfigurationChangeEvent', () => {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export class ConfigurationModel implements IConfigurationModel {`
`85`	`85`	`if (override) {`
`86`	`86`	`this.mergeContents(override.contents, otherOverride.contents);`
`87`	`87`	`} else {`
`88`		`- overrides.push(otherOverride);`
	`88`	`+ overrides.push(objects.deepClone(otherOverride));`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`for (const key of other.keys) {`