https-githubsup-com
diff --git a/‎src/vs/base/common/objects.ts‎
Lines changed: 23 additions & 0 deletions b/‎src/vs/base/common/objects.ts‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎src/vs/editor/standalone/browser/simpleServices.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/vs/editor/standalone/browser/simpleServices.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/vs/platform/configuration/common/configuration.ts‎
Lines changed: 21 additions & 1 deletion b/‎src/vs/platform/configuration/common/configuration.ts‎
Lines changed: 21 additions & 1 deletion
@@ -41,6 +41,29 @@ export function deepClone<T>(obj: T): T {
 	return result;
 }
 
+export function deepFreeze<T>(obj: T): T {
+
+	if (!obj || typeof obj !== 'object') {
+		return obj;
+	}
+
+	// Retrieve the property names defined on obj
+	var propNames = Object.getOwnPropertyNames(obj);
+
+	// Freeze properties before freezing self
+	propNames.forEach(function (name) {
+		var prop = obj[name];
+
+		// Freeze prop if it is an object
+		if (typeof prop === 'object' && prop !== null) {
+			deepFreeze(prop);
+		}
+	});
+
+	// Freeze self (no-op if already frozen)
+	return Object.freeze(obj);
+}
+
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 
 export function cloneAndChange(obj: any, changer: (orig: any) => any): any {
 
@@ -23,7 +23,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { Selection } from 'vs/editor/common/core/selection';
 import Event, { Emitter } from 'vs/base/common/event';
-import { Configuration, ConfigurationModel, DefaultConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
+import { Configuration, DefaultConfigurationModel, ConfigurationModel } from 'vs/platform/configuration/common/configurationModels';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration';
 
@@ -11,7 +11,7 @@ import Event from 'vs/base/common/event';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
 import { StrictResourceMap } from 'vs/base/common/map';
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
@@ -124,6 +124,26 @@ export function compare(from: IConfigurationModel, to: IConfigurationModel): { a
 	return { added, removed, updated };
 }
 
+export function toOverrides(raw: any, conflictReporter: (message: string) => void): IOverrides[] {
+	const overrides: IOverrides[] = [];
+	const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
+	for (const key of Object.keys(raw)) {
+		if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+			const overrideRaw = {};
+			for (const keyInOverrideRaw in raw[key]) {
+				if (configurationProperties[keyInOverrideRaw] && configurationProperties[keyInOverrideRaw].overridable) {
+					overrideRaw[keyInOverrideRaw] = raw[key][keyInOverrideRaw];
+				}
+			}
+			overrides.push({
+				identifiers: [overrideIdentifierFromKey(key).trim()],
+				contents: toValuesTree(overrideRaw, conflictReporter)
+			});
+		}
+	}
+	return overrides;
+}
+
 export function toValuesTree(properties: { [qualifiedKey: string]: any }, conflictReporter: (message: string) => void): any {
 	const root = Object.create(null);