Fix overriding preferences

Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
eclipse-theia · May 21, 2019 · a235f1c · a235f1c
1 parent f7e55b9
commit a235f1c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/plugin-ext/src/plugin/preference-registry.ts b/packages/plugin-ext/src/plugin/preference-registry.ts
@@ -234,10 +234,14 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         return new ConfigurationModel(this.parseConfigurationData(data), Object.keys(data));
     }
 
+    private readonly OVERRIDE_PROPERTY = '\\[(.*)\\]$';
+    private readonly OVERRIDE_PROPERTY_PATTERN = new RegExp(this.OVERRIDE_PROPERTY);
+
     private parseConfigurationData(data: { [key: string]: any }): { [key: string]: any } {
         return Object.keys(data).reduce((result: any, key: string) => {
             const parts = key.split('.');
             let branch = result;
+
             for (let i = 0; i < parts.length; i++) {
                 if (i === parts.length - 1) {
                     branch[parts[i]] = data[key];
@@ -247,6 +251,16 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
                     branch[parts[i]] = {};
                 }
                 branch = branch[parts[i]];
+
+                // overridden properties should be transformed into
+                // "[overridden_identifier]" : {
+                //              "property1" : "value1"
+                //              "property2" : "value2"
+                //  }
+                if (i === 0 && this.OVERRIDE_PROPERTY_PATTERN.test(parts[i])) {
+                    branch[key.substring(parts[0].length + 1)] = data[key];
+                    break;
+                }
             }
             return result;
         }, {});

diff --git a/packages/preferences/src/browser/abstract-resource-preference-provider.ts b/packages/preferences/src/browser/abstract-resource-preference-provider.ts
@@ -158,8 +158,8 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
             if (this.schemaProvider.testOverrideValue(preferenceName, preferenceValue)) {
                 // tslint:disable-next-line:forin
                 for (const overriddenPreferenceName in preferenceValue) {
-                    const overriddeValue = preferenceValue[overriddenPreferenceName];
-                    preferences[`${preferenceName}.${overriddenPreferenceName}`] = overriddeValue;
+                    const overriddenValue = preferenceValue[overriddenPreferenceName];
+                    preferences[`${preferenceName}.${overriddenPreferenceName}`] = overriddenValue;
                 }
             } else {
                 preferences[preferenceName] = preferenceValue;