From 4bf94c8e5931b6f4714342f10d7416d4d6c1c80c Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 7 Feb 2017 19:57:59 +0100 Subject: [PATCH] #19733 Validate default settings to be overridden for a language --- .../platform/configuration/common/configurationRegistry.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index f476ad695ab..e774aa7fb0c 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -127,13 +127,14 @@ class ConfigurationRegistry implements IConfigurationRegistry { } for (const key in configurationNode.defaults) { - if (OVERRIDE_PROPERTY_PATTERN.test(key)) { + const defaultValue = configurationNode.defaults[key]; + if (OVERRIDE_PROPERTY_PATTERN.test(key) && typeof defaultValue === 'object') { if (!configurationNode.properties) { configurationNode.properties = {}; } configurationNode.properties[key] = { type: 'object', - default: configurationNode.defaults[key], + default: defaultValue, description: nls.localize('overrideSettings.description', "Configure editor settings to be overridden for {0} language.", key), $ref: editorConfigurationSchemaId }; -- GitLab