use yamlSchemaService

modifies to use yamlSchemaService for add and delete schema

Author: gorkem

src/languageservice/apis/schemaModification.ts

@@ -2,8 +2,8 @@
  *  Copyright (c) Red Hat, Inc. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { JSONSchemaService } from '../services/jsonSchemaService';
-import { JSONSchema } from '../jsonSchema04';
+import { JSONSchema } from '../jsonSchema07';
+import { YAMLSchemaService } from '../services/yamlSchemaService';
 
 export enum MODIFICATION_ACTIONS {
     'delete',
@@ -31,7 +31,7 @@ export class SchemaModification {
     /**
      * Add content to a specified schema at a specified path
      */
-    public async addContent(schemaService: JSONSchemaService, additions: SchemaAdditions) {
+    public async addContent(schemaService: YAMLSchemaService, additions: SchemaAdditions) {
         const schema = await schemaService.getResolvedSchema(additions.schema);
         if (schema) {
             const resolvedSchemaLocation = this.resolveJSONSchemaToSection(schema.schema, additions.path);
@@ -46,7 +46,7 @@ export class SchemaModification {
     /**
      * Delete content in a specified schema at a specified path
      */
-    public async deleteContent(schemaService: JSONSchemaService, deletions: SchemaDeletions) {
+    public async deleteContent(schemaService: YAMLSchemaService, deletions: SchemaDeletions) {
         const schema = await schemaService.getResolvedSchema(deletions.schema);
         if (schema) {
             const resolvedSchemaLocation = this.resolveJSONSchemaToSection(schema.schema, deletions.path);

src/languageservice/services/yamlSchemaService.ts

@@ -45,6 +45,9 @@ export class FilePatternAssociation {
 }
 
 export class YAMLSchemaService extends JSONSchemaService {
+    // To allow to use schemasById from super.
+// tslint:disable-next-line: no-any
+    [x: string]: any;
 
     private customSchemaProvider: CustomSchemaProvider | undefined;
     private filePatternAssociations: FilePatternAssociation[];
@@ -235,6 +238,26 @@ export class YAMLSchemaService extends JSONSchemaService {
             return resolveSchema();
         }
     }
+    /**
+     * Save a schema with schema ID and schema content.
+     * Overrides previous schemas set for that schema ID.
+     */
+    public async saveSchema(schemaId: string, schemaContent: JSONSchema): Promise<void> {
+        const id = this.normalizeId(schemaId);
+        this.getOrAddSchemaHandle(id, schemaContent);
+        return Promise.resolve(undefined);
+    }
+
+    /**
+     * Delete a schema with schema ID.
+     */
+    public async deleteSchema(schemaId: string): Promise<void> {
+        const id = this.normalizeId(schemaId);
+        if ( this.schemasById[id] ) {
+            delete this.schemasById[id];
+        }
+        return Promise.resolve(undefined);
+    }
 
     /**
      * Everything below here is needed because we're importing from vscode-json-languageservice umd and we need

src/languageservice/yamlLanguageService.ts

@@ -6,7 +6,7 @@
 
 import { YAMLSchemaService, CustomSchemaProvider } from './services/yamlSchemaService';
 import { TextDocument, Position, CompletionList, Diagnostic, Hover, SymbolInformation, DocumentSymbol, CompletionItem, TextEdit } from 'vscode-languageserver-types';
-import { JSONSchema } from './jsonSchema04';
+import { JSONSchema } from './jsonSchema07';
 import { YAMLDocumentSymbols } from './services/documentSymbols';
 import { YAMLCompletion } from './services/yamlCompletion';
 import { YAMLHover } from './services/yamlHover';

test/schema.test.ts

@@ -329,8 +329,9 @@ suite('JSON Schema', () => {
         assert.notEqual(schema, undefined);
         testDone();
        });
+    });
     test('Modifying schema', async () => {
-        const service = new SchemaService.JSONSchemaService(requestServiceMock, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(requestServiceMock, workspaceContext);
         service.setSchemaContributions({
             schemas: {
                 'https://myschemastore/main/schema1.json': {
@@ -377,7 +378,7 @@ suite('JSON Schema', () => {
     });
 
     test('Deleting schema', async () => {
-        const service = new SchemaService.JSONSchemaService(requestServiceMock, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(requestServiceMock, workspaceContext);
         service.setSchemaContributions({
             schemas: {
                 'https://myschemastore/main/schema1.json': {
@@ -421,7 +422,7 @@ suite('JSON Schema', () => {
     });
 
     test('Modifying schema works with kubernetes resolution', async () => {
-        const service = new SchemaService.JSONSchemaService(schemaRequestServiceForURL, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(schemaRequestServiceForURL, workspaceContext);
         service.registerExternalSchema(KUBERNETES_SCHEMA_URL);
 
         const schemaModification = new SchemaModification();
@@ -441,7 +442,7 @@ suite('JSON Schema', () => {
     });
 
     test('Deleting schema works with Kubernetes resolution', async () => {
-        const service = new SchemaService.JSONSchemaService(schemaRequestServiceForURL, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(schemaRequestServiceForURL, workspaceContext);
         service.registerExternalSchema(KUBERNETES_SCHEMA_URL);
 
         const schemaModification = new SchemaModification();
@@ -457,7 +458,7 @@ suite('JSON Schema', () => {
     });
 
     test('Adding a brand new schema', async () => {
-        const service = new SchemaService.JSONSchemaService(schemaRequestServiceForURL, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(schemaRequestServiceForURL, workspaceContext);
         service.saveSchema('hello_world', {
             enum: [
                 'test1',
@@ -470,7 +471,7 @@ suite('JSON Schema', () => {
     });
 
     test('Deleting an existing schema', async () => {
-        const service = new SchemaService.JSONSchemaService(schemaRequestServiceForURL, workspaceContext);
+        const service = new SchemaService.YAMLSchemaService(schemaRequestServiceForURL, workspaceContext);
         service.saveSchema('hello_world', {
             enum: [
                 'test1',