Fix inline schema with url handling (#505)

* Fix inline schema with url handling

Signed-off-by: Yevhen Vydolob <[email protected]>

* Fix test

Signed-off-by: Yevhen Vydolob <[email protected]>

Author: evidolob

src/languageservice/services/yamlSchemaService.ts

@@ -281,7 +281,7 @@ export class YAMLSchemaService extends JSONSchemaService {
 
       let schemaFromModeline = this.getSchemaFromModeline(doc);
       if (schemaFromModeline !== undefined) {
-        if (!schemaFromModeline.startsWith('file:')) {
+        if (!schemaFromModeline.startsWith('file:') && !schemaFromModeline.startsWith('http')) {
           if (!path.isAbsolute(schemaFromModeline)) {
             const resUri = URI.parse(resource);
             schemaFromModeline = URI.file(path.resolve(path.parse(resUri.fsPath).dir, schemaFromModeline)).toString();

test/yamlSchemaService.test.ts

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Red Hat. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as sinon from 'sinon';
+import * as chai from 'chai';
+import * as sinonChai from 'sinon-chai';
+import * as SchemaService from '../src/languageservice/services/yamlSchemaService';
+import { parse } from '../src/languageservice/parser/yamlParser07';
+
+const expect = chai.expect;
+chai.use(sinonChai);
+
+describe('YAML Schema Service', () => {
+  const sandbox = sinon.createSandbox();
+  afterEach(() => {
+    sandbox.restore();
+  });
+
+  describe('Schema for resource', () => {
+    let requestServiceMock: sinon.SinonSpy;
+
+    beforeEach(() => {
+      requestServiceMock = sandbox.fake.resolves(undefined);
+    });
+
+    it('should handle inline schema http url', () => {
+      const documentContent = `# yaml-language-server: $schema=http://json-schema.org/draft-07/schema# anothermodeline=value\n`;
+      const content = `${documentContent}\n---\n- `;
+      const yamlDock = parse(content);
+
+      const service = new SchemaService.YAMLSchemaService(requestServiceMock);
+      service.getSchemaForResource('', yamlDock.documents[0]);
+
+      expect(requestServiceMock).calledOnceWith('http://json-schema.org/draft-07/schema#');
+    });
+
+    it('should handle inline schema https url', () => {
+      const documentContent = `# yaml-language-server: $schema=https://json-schema.org/draft-07/schema# anothermodeline=value\n`;
+      const content = `${documentContent}\n---\n- `;
+      const yamlDock = parse(content);
+
+      const service = new SchemaService.YAMLSchemaService(requestServiceMock);
+      service.getSchemaForResource('', yamlDock.documents[0]);
+
+      expect(requestServiceMock).calledOnceWith('https://json-schema.org/draft-07/schema#');
+    });
+  });
+});