Allow JSON Schemas to be set dynamically

redhat-developer · May 31, 2019 · 39e800c · 39e800c
1 parent 4b2f792
commit 39e800c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
@@ -685,7 +685,7 @@ export class YAMLCompletion {
 
         const propertyText = this.getInsertTextForValue(key, '');
         // if (!addValue) {
-        // 	return propertyText;
+        //     return propertyText;
         // }
         const resultText = propertyText + ':';
 

diff --git a/src/server.ts b/src/server.ts
@@ -256,15 +256,24 @@ connection.onDidChangeConfiguration(change => {
     }
     schemaConfigurationSettings = [];
 
+    const jsonSchemas = [];
     for (const url in yamlConfigurationSettings){
         const globPattern = yamlConfigurationSettings[url];
+        const checkedURL = url.toLowerCase() === 'kubernetes' ? KUBERNETES_SCHEMA_URL : url;
         const schemaObj = {
             'fileMatch': Array.isArray(globPattern) ? globPattern : [globPattern],
-            'url': url
+            'uri': checkedURL
         };
+        jsonSchemas.push(schemaObj);
         schemaConfigurationSettings.push(schemaObj);
     }
 
+    jsonLanguageService.configure({
+        schemas: jsonSchemas,
+        validate: settings.yaml.validate,
+        allowComments: true
+    });
+
     setSchemaStoreSettingsIfNotSet();
 
     updateConfiguration();
@@ -370,7 +379,7 @@ function updateConfiguration() {
     }
     if (schemaConfigurationSettings) {
         schemaConfigurationSettings.forEach(schema => {
-            let uri = schema.url;
+            let uri = schema.uri;
             if (!uri && schema.schema) {
                 uri = schema.schema.id;
             }
@@ -384,13 +393,6 @@ function updateConfiguration() {
                 }
                 languageSettings = configureSchemas(uri, schema.fileMatch, schema.schema, languageSettings);
             }
-            jsonLanguageService.configure({
-                schemas: [{
-                    fileMatch: ['*.yaml', '*.yml'],
-                    uri: 'https://raw.githubusercontent.com/garethr/kubernetes-json-schema/master/v1.14.0-standalone-strict/all.json'
-                }],
-                validate: true
-            });
         });
     }
     if (schemaStoreSettings){