Merge from vscode 0a7364f00514c46c9caceece15e1f82f82e3712f

src/vs/platform/configuration/common/configuration.ts

@@ -10,7 +10,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, OVERRIDE_PROPERTY_PATTERN } from 'vs/platform/configuration/common/configurationRegistry';
+import { IConfigurationRegistry, Extensions, OVERRIDE_PROPERTY_PATTERN, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configurationRegistry';
 import { IStringDictionary } from 'vs/base/common/collections';
 
 export const IConfigurationService = createDecorator<IConfigurationService>('configurationService');
@@ -354,10 +354,6 @@ export function getDefaultValues(): any {
 	return valueTreeRoot;
 }
 
-export function overrideIdentifierFromKey(key: string): string {
-	return key.substring(1, key.length - 1);
-}
-
 export function keyFromOverrideIdentifier(overrideIdentifier: string): string {
 	return `[${overrideIdentifier}]`;
 }

src/vs/platform/configuration/common/configurationModels.ts

@@ -9,8 +9,8 @@ import * as arrays from 'vs/base/common/arrays';
 import * as types from 'vs/base/common/types';
 import * as objects from 'vs/base/common/objects';
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { OVERRIDE_PROPERTY_PATTERN, ConfigurationScope, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
-import { IOverrides, overrideIdentifierFromKey, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, removeFromValueTree, toOverrides, IConfigurationValue, ConfigurationTarget, compare, IConfigurationChangeEvent, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
+import { OVERRIDE_PROPERTY_PATTERN, ConfigurationScope, IConfigurationRegistry, Extensions, IConfigurationPropertySchema, overrideIdentifierFromKey } from 'vs/platform/configuration/common/configurationRegistry';
+import { IOverrides, addToValueTree, toValuesTree, IConfigurationModel, getConfigurationValue, IConfigurationOverrides, IConfigurationData, getDefaultValues, getConfigurationKeys, removeFromValueTree, toOverrides, IConfigurationValue, ConfigurationTarget, compare, IConfigurationChangeEvent, IConfigurationChange } from 'vs/platform/configuration/common/configuration';
 import { Workspace } from 'vs/platform/workspace/common/workspace';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { Disposable } from 'vs/base/common/lifecycle';

src/vs/platform/configuration/common/configurationRegistry.ts

@@ -9,7 +9,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { Registry } from 'vs/platform/registry/common/platform';
 import * as types from 'vs/base/common/types';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export const Extensions = {
 	Configuration: 'base.contributions.configuration'
@@ -35,12 +35,12 @@ export interface IConfigurationRegistry {
 	/**
 	 * Register multiple default configurations to the registry.
 	 */
-	registerDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void;
+	registerDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void;
 
 	/**
 	 * Deregister multiple default configurations from the registry.
 	 */
-	deregisterDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void;
+	deregisterDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void;
 
 	/**
 	 * Signal that the schema of a configuration setting has changes. It is currently only supported to change enumeration values.
@@ -131,12 +131,6 @@ export interface IConfigurationNode {
 	extensionInfo?: IConfigurationExtensionInfo;
 }
 
-export interface IDefaultConfigurationExtension {
-	id: ExtensionIdentifier;
-	name: string;
-	defaults: { [key: string]: {} };
-}
-
 type SettingProperties = { [key: string]: any };
 
 export const allSettings: { properties: SettingProperties, patternProperties: SettingProperties } = { properties: {}, patternProperties: {} };
@@ -152,7 +146,8 @@ const contributionRegistry = Registry.as<IJSONContributionRegistry>(JSONExtensio
 
 class ConfigurationRegistry implements IConfigurationRegistry {
 
-	private readonly defaultOverridesConfigurationNode: IConfigurationNode;
+	private readonly defaultValues: IStringDictionary<any>;
+	private readonly defaultLanguageConfigurationOverridesNode: IConfigurationNode;
 	private readonly configurationContributors: IConfigurationNode[];
 	private readonly configurationProperties: { [qualifiedKey: string]: IJSONSchema };
 	private readonly excludedConfigurationProperties: { [qualifiedKey: string]: IJSONSchema };
@@ -166,12 +161,13 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 	readonly onDidUpdateConfiguration: Event<string[]> = this._onDidUpdateConfiguration.event;
 
 	constructor() {
-		this.defaultOverridesConfigurationNode = {
+		this.defaultValues = {};
+		this.defaultLanguageConfigurationOverridesNode = {
 			id: 'defaultOverrides',
-			title: nls.localize('defaultConfigurations.title', "Default Configuration Overrides"),
+			title: nls.localize('defaultLanguageConfigurationOverrides.title', "Default Language Configuration Overrides"),
 			properties: {}
 		};
-		this.configurationContributors = [this.defaultOverridesConfigurationNode];
+		this.configurationContributors = [this.defaultLanguageConfigurationOverridesNode];
 		this.resourceLanguageSettingsSchema = { properties: {}, patternProperties: {}, additionalProperties: false, errorMessage: 'Unknown editor configuration setting', allowTrailingCommas: true, allowComments: true };
 		this.configurationProperties = {};
 		this.excludedConfigurationProperties = {};
@@ -202,29 +198,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			if (configuration.properties) {
 				for (const key in configuration.properties) {
 					properties.push(key);
-
 					delete this.configurationProperties[key];
-
-					// Delete from schema
-					delete allSettings.properties[key];
-					switch (configuration.properties[key].scope) {
-						case ConfigurationScope.APPLICATION:
-							delete applicationSettings.properties[key];
-							break;
-						case ConfigurationScope.MACHINE:
-							delete machineSettings.properties[key];
-							break;
-						case ConfigurationScope.MACHINE_OVERRIDABLE:
-							delete machineOverridableSettings.properties[key];
-							break;
-						case ConfigurationScope.WINDOW:
-							delete windowSettings.properties[key];
-							break;
-						case ConfigurationScope.RESOURCE:
-						case ConfigurationScope.LANGUAGE_OVERRIDABLE:
-							delete resourceSettings.properties[key];
-							break;
-					}
+					this.removeFromSchema(key, configuration.properties[key]);
 				}
 			}
 			if (configuration.allOf) {
@@ -244,41 +219,60 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		this._onDidUpdateConfiguration.fire(properties);
 	}
 
-	public registerDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void {
+	public registerDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void {
 		const properties: string[] = [];
+		const overrideIdentifiers: string[] = [];
 
 		for (const defaultConfiguration of defaultConfigurations) {
-			for (const key in defaultConfiguration.defaults) {
-				const defaultValue = defaultConfiguration.defaults[key];
-				if (OVERRIDE_PROPERTY_PATTERN.test(key) && typeof defaultValue === 'object') {
-					const propertySchema: IConfigurationPropertySchema = {
+			for (const key in defaultConfiguration) {
+				properties.push(key);
+				this.defaultValues[key] = defaultConfiguration[key];
+
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					const property: IConfigurationPropertySchema = {
 						type: 'object',
-						default: defaultValue,
-						description: nls.localize('overrideSettings.description', "Configure editor settings to be overridden for {0} language.", key),
+						default: this.defaultValues[key],
+						description: nls.localize('defaultLanguageConfiguration.description', "Configure settings to be overridden for {0} language.", key),
 						$ref: resourceLanguageSettingsSchemaId
 					};
-					allSettings.properties[key] = propertySchema;
-					this.defaultOverridesConfigurationNode.properties![key] = propertySchema;
-					this.configurationProperties[key] = propertySchema;
-					properties.push(key);
+					overrideIdentifiers.push(overrideIdentifierFromKey(key));
+					this.configurationProperties[key] = property;
+					this.defaultLanguageConfigurationOverridesNode.properties![key] = property;
+				} else {
+					const property = this.configurationProperties[key];
+					if (property) {
+						this.updatePropertyDefaultValue(key, property);
+						this.updateSchema(key, property);
+					}
 				}
 			}
 		}
 
+		this.registerOverrideIdentifiers(overrideIdentifiers);
 		this._onDidSchemaChange.fire();
 		this._onDidUpdateConfiguration.fire(properties);
 	}
 
-	public deregisterDefaultConfigurations(defaultConfigurations: IDefaultConfigurationExtension[]): void {
+	public deregisterDefaultConfigurations(defaultConfigurations: IStringDictionary<any>[]): void {
 		const properties: string[] = [];
 		for (const defaultConfiguration of defaultConfigurations) {
-			for (const key in defaultConfiguration.defaults) {
+			for (const key in defaultConfiguration) {
 				properties.push(key);
-				delete allSettings.properties[key];
-				delete this.defaultOverridesConfigurationNode.properties![key];
-				delete this.configurationProperties[key];
+				delete this.defaultValues[key];
+				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
+					delete this.configurationProperties[key];
+					delete this.defaultLanguageConfigurationOverridesNode.properties![key];
+				} else {
+					const property = this.configurationProperties[key];
+					if (property) {
+						this.updatePropertyDefaultValue(key, property);
+						this.updateSchema(key, property);
+					}
+				}
 			}
 		}
+
+		this.updateOverridePropertyPatternKey();
 		this._onDidSchemaChange.fire();
 		this._onDidUpdateConfiguration.fire(properties);
 	}
@@ -291,7 +285,6 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		for (const overrideIdentifier of overrideIdentifiers) {
 			this.overrideIdentifiers.add(overrideIdentifier);
 		}
-
 		this.updateOverridePropertyPatternKey();
 	}
 
@@ -305,12 +298,13 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 					delete properties[key];
 					continue;
 				}
-				// fill in default values
-				let property = properties[key];
-				let defaultValue = property.default;
-				if (types.isUndefined(defaultValue)) {
-					property.default = getDefaultValue(property.type);
-				}
+
+				const property = properties[key];
+
+				// update default value
+				this.updatePropertyDefaultValue(key, property);
+
+				// update scope
 				if (OVERRIDE_PROPERTY_PATTERN.test(key)) {
 					property.scope = undefined; // No scope for overridable properties `[${identifier}]`
 				} else {
@@ -361,28 +355,7 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 			let properties = configuration.properties;
 			if (properties) {
 				for (const key in properties) {
-					allSettings.properties[key] = properties[key];
-					switch (properties[key].scope) {
-						case ConfigurationScope.APPLICATION:
-							applicationSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.MACHINE:
-							machineSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.MACHINE_OVERRIDABLE:
-							machineOverridableSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.WINDOW:
-							windowSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.RESOURCE:
-							resourceSettings.properties[key] = properties[key];
-							break;
-						case ConfigurationScope.LANGUAGE_OVERRIDABLE:
-							resourceSettings.properties[key] = properties[key];
-							this.resourceLanguageSettingsSchema.properties![key] = properties[key];
-							break;
-					}
+					this.updateSchema(key, properties[key]);
 				}
 			}
 			let subNodes = configuration.allOf;
@@ -393,6 +366,53 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		register(configuration);
 	}
 
+	private updateSchema(key: string, property: IConfigurationPropertySchema): void {
+		allSettings.properties[key] = property;
+		switch (property.scope) {
+			case ConfigurationScope.APPLICATION:
+				applicationSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.MACHINE:
+				machineSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.MACHINE_OVERRIDABLE:
+				machineOverridableSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.WINDOW:
+				windowSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.RESOURCE:
+				resourceSettings.properties[key] = property;
+				break;
+			case ConfigurationScope.LANGUAGE_OVERRIDABLE:
+				resourceSettings.properties[key] = property;
+				this.resourceLanguageSettingsSchema.properties![key] = property;
+				break;
+		}
+	}
+
+	private removeFromSchema(key: string, property: IConfigurationPropertySchema): void {
+		delete allSettings.properties[key];
+		switch (property.scope) {
+			case ConfigurationScope.APPLICATION:
+				delete applicationSettings.properties[key];
+				break;
+			case ConfigurationScope.MACHINE:
+				delete machineSettings.properties[key];
+				break;
+			case ConfigurationScope.MACHINE_OVERRIDABLE:
+				delete machineOverridableSettings.properties[key];
+				break;
+			case ConfigurationScope.WINDOW:
+				delete windowSettings.properties[key];
+				break;
+			case ConfigurationScope.RESOURCE:
+			case ConfigurationScope.LANGUAGE_OVERRIDABLE:
+				delete resourceSettings.properties[key];
+				break;
+		}
+	}
+
 	private updateOverridePropertyPatternKey(): void {
 		for (const overrideIdentifier of this.overrideIdentifiers.values()) {
 			const overrideIdentifierProperty = `[${overrideIdentifier}]`;
@@ -401,8 +421,8 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 				description: nls.localize('overrideSettings.defaultDescription', "Configure editor settings to be overridden for a language."),
 				errorMessage: nls.localize('overrideSettings.errorMessage', "This setting does not support per-language configuration."),
 				$ref: resourceLanguageSettingsSchemaId,
-				default: this.defaultOverridesConfigurationNode.properties![overrideIdentifierProperty]?.default
 			};
+			this.updatePropertyDefaultValue(overrideIdentifierProperty, resourceLanguagePropertiesSchema);
 			allSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 			applicationSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
 			machineSettings.properties[overrideIdentifierProperty] = resourceLanguagePropertiesSchema;
@@ -412,11 +432,26 @@ class ConfigurationRegistry implements IConfigurationRegistry {
 		}
 		this._onDidSchemaChange.fire();
 	}
+
+	private updatePropertyDefaultValue(key: string, property: IConfigurationPropertySchema): void {
+		let defaultValue = this.defaultValues[key];
+		if (types.isUndefined(defaultValue)) {
+			defaultValue = property.default;
+		}
+		if (types.isUndefined(defaultValue)) {
+			defaultValue = getDefaultValue(property.type);
+		}
+		property.default = defaultValue;
+	}
 }
 
 const OVERRIDE_PROPERTY = '\\[.*\\]$';
 export const OVERRIDE_PROPERTY_PATTERN = new RegExp(OVERRIDE_PROPERTY);
 
+export function overrideIdentifierFromKey(key: string): string {
+	return key.substring(1, key.length - 1);
+}
+
 export function getDefaultValue(type: string | string[] | undefined): any {
 	const t = Array.isArray(type) ? (<string[]>type)[0] : <string>type;
 	switch (t) {