fixup! read preference schema from a plugin's manifest file

eclipse-theia · Oct 12, 2018 · cd8ef2b · cd8ef2b
1 parent 2d1872b
commit cd8ef2b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/core/src/browser/preferences/preference-contribution.ts b/packages/core/src/browser/preferences/preference-contribution.ts
@@ -67,8 +67,9 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
     ) {
         super();
         this.preferenceContributions.getContributions().forEach(contrib => {
-            this.setSchema(contrib.schema);
+            this.setSchema(contrib.schema, false);
         });
+        this.validateFunction = new Ajv().compile(this.combinedSchema);
         this._ready.resolve();
     }
 
@@ -84,7 +85,7 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
         return this.preferences;
     }
 
-    setSchema(schema: PreferenceSchema): void {
+    setSchema(schema: PreferenceSchema, updateValidation: boolean = true): void {
         const props: string[] = [];
         for (const property in schema.properties) {
             if (this.combinedSchema.properties[property]) {
@@ -94,7 +95,10 @@ export class PreferenceSchemaProvider extends PreferenceProvider {
                 props.push(property);
             }
         }
-        this.validateFunction = new Ajv().compile(this.combinedSchema);
+        if (updateValidation) {
+            this.validateFunction = new Ajv().compile(this.combinedSchema);
+        }
+
         // tslint:disable-next-line:forin
         for (const property of props) {
             this.preferences[property] = this.combinedSchema.properties[property].default;