Merge 395258f into 75d031d

redhat-developer · Aug 24, 2019 · dd6eca5 · dd6eca5
2 parents 75d031d + 395258f
commit dd6eca5
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/languageservice/services/jsonSchemaService.ts b/src/languageservice/services/jsonSchemaService.ts
@@ -545,8 +545,8 @@ export class JSONSchemaService implements IJSONSchemaService {
                                return resolveSchema();
                            }
 
-                           this.loadSchema(schemaUri)
-                               .then(unsolvedSchema => this.resolveSchemaContent(unsolvedSchema, schemaUri))
+                           return this.loadSchema(schemaUri)
+                               .then(unsolvedSchema => this.resolveSchemaContent(unsolvedSchema, schemaUri));
                         })
                        .then(schema => schema, err => resolveSchema());
         } else {

diff --git a/src/languageservice/services/yamlHover.ts b/src/languageservice/services/yamlHover.ts
@@ -10,12 +10,14 @@ import { Hover, TextDocument, Position } from 'vscode-languageserver-types';
 import { matchOffsetToDocument2 } from '../utils/arrUtils';
 import { LanguageSettings } from '../yamlLanguageService';
 import { parse as parseYAML } from '../parser/yamlParser07';
+import { CustomSchemaProvider } from './jsonSchemaService';
 
 export class YAMLHover {
 
     private promise: PromiseConstructor;
     private shouldHover: boolean;
     private jsonLanguageService: LanguageService;
+    public customSchemaProvider: CustomSchemaProvider = null;
 
     constructor(promiseConstructor: PromiseConstructor, jsonLanguageService: LanguageService) {
         this.promise = promiseConstructor || Promise;
@@ -41,6 +43,22 @@ export class YAMLHover {
             return this.promise.resolve(void 0);
         }
 
+        if (this.customSchemaProvider) {
+            return this.customSchemaProvider(document.uri).then(schemaURI => {
+                if (schemaURI) {
+                    this.jsonLanguageService.configure({
+                        schemas: [
+                            {
+                                fileMatch: ['*.yaml', '*.yml'],
+                                uri: schemaURI
+                            }
+                        ]
+                    });
+                }
+                return this.jsonLanguageService.doHover(document, position, currentDoc);
+            });
+        }
+
         return this.jsonLanguageService.doHover(document, position, currentDoc);
     }
 }
diff --git a/src/languageservice/services/yamlValidation.ts b/src/languageservice/services/yamlValidation.ts
@@ -10,13 +10,15 @@ import { PromiseConstructor, LanguageSettings } from '../yamlLanguageService';
 import { LanguageService } from 'vscode-json-languageservice';
 import { parse as parseYAML, YAMLDocument } from '../parser/yamlParser07';
 import { SingleYAMLDocument } from '../parser/yamlParser04';
+import { CustomSchemaProvider } from './jsonSchemaService';
 
 export class YAMLValidation {
 
     private promise: PromiseConstructor;
     private validationEnabled: boolean;
     private jsonLanguageService: LanguageService;
     private customTags: String[];
+    public customSchemaProvider: CustomSchemaProvider = null;
 
     private MATCHES_MULTIPLE = 'Matches multiple schemas when only one must validate.';
 
@@ -42,6 +44,21 @@ export class YAMLValidation {
         const validationResult: Diagnostic[] = [];
         for (const currentYAMLDoc of yamlDocument.documents) {
             currentYAMLDoc.isKubernetes = isKubernetes;
+
+            if (this.customSchemaProvider) {
+                const uri = await this.customSchemaProvider(textDocument.uri);
+                if (uri) {
+                    this.jsonLanguageService.configure({
+                        validate: true,
+                        schemas: [
+                            {
+                                fileMatch: ['*.yaml', '*.yml'],
+                                uri: uri
+                            }
+                        ]
+                    });
+                }
+            }
             const validation = await this.jsonLanguageService.doValidation(textDocument, currentYAMLDoc);
             const syd = currentYAMLDoc as unknown as SingleYAMLDocument;
             if (syd.errors.length > 0) {

diff --git a/src/languageservice/yamlLanguageService.ts b/src/languageservice/yamlLanguageService.ts
@@ -154,6 +154,8 @@ export function getLanguageService(schemaRequestService: SchemaRequestService,
       },
       registerCustomSchemaProvider: (schemaProvider: CustomSchemaProvider) => {
         schemaService.registerCustomSchemaProvider(schemaProvider);
+        hover.customSchemaProvider = schemaProvider;
+        yamlValidation.customSchemaProvider = schemaProvider;
       },
       doComplete: completer.doComplete.bind(completer),
       doResolve: completer.doResolve.bind(completer),