From 0725387faaa5ead5810164bc28941464d6af5028 Mon Sep 17 00:00:00 2001 From: Gorkem Ercan Date: Fri, 17 Jan 2020 11:39:35 -0500 Subject: [PATCH] Remove schema4 and rename schema7 to schema Removes the last references of schema4 and renames schema7 to be the schema object. --- .../{jsonSchema07.ts => jsonSchema.ts} | 0 src/languageservice/jsonSchema04.ts | 57 ------------------- src/languageservice/parser/jsonParser07.ts | 2 +- .../services/yamlCompletion.ts | 2 +- .../services/yamlSchemaService.ts | 2 +- src/languageservice/yamlLanguageService.ts | 2 +- src/server.ts | 2 +- test/schema.test.ts | 2 +- 8 files changed, 6 insertions(+), 63 deletions(-) rename src/languageservice/{jsonSchema07.ts => jsonSchema.ts} (100%) delete mode 100644 src/languageservice/jsonSchema04.ts diff --git a/src/languageservice/jsonSchema07.ts b/src/languageservice/jsonSchema.ts similarity index 100% rename from src/languageservice/jsonSchema07.ts rename to src/languageservice/jsonSchema.ts diff --git a/src/languageservice/jsonSchema04.ts b/src/languageservice/jsonSchema04.ts deleted file mode 100644 index afeb53af4..000000000 --- a/src/languageservice/jsonSchema04.ts +++ /dev/null @@ -1,57 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Red Hat, Inc. All rights reserved. - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; - -export interface JSONSchema { - id?: string; - $schema?: string; - type?: string | string[]; - title?: string; - // tslint:disable-next-line: no-any - default?: any; - definitions?: JSONSchemaMap; - description?: string; - properties?: JSONSchemaMap; - patternProperties?: JSONSchemaMap; - // tslint:disable-next-line: no-any - additionalProperties?: any; - minProperties?: number; - maxProperties?: number; - dependencies?: JSONSchemaMap | string[]; - // tslint:disable-next-line: no-any - items?: any; - minItems?: number; - maxItems?: number; - uniqueItems?: boolean; - additionalItems?: boolean; - pattern?: string; - minLength?: number; - maxLength?: number; - minimum?: number; - maximum?: number; - exclusiveMinimum?: boolean; - exclusiveMaximum?: boolean; - multipleOf?: number; - required?: string[]; - $ref?: string; - anyOf?: JSONSchema[]; - allOf?: JSONSchema[]; - oneOf?: JSONSchema[]; - not?: JSONSchema; - // tslint:disable-next-line: no-any - enum?: any[]; - format?: string; - errorMessage?: string; // VSCode extension - patternErrorMessage?: string; // VSCode extension - deprecationMessage?: string; // VSCode extension - enumDescriptions?: string[]; // VSCode extension - - schemaSequence?: JSONSchema[]; // extension for multiple schemas related to multiple documents in single yaml file -} - -export interface JSONSchemaMap { - [name: string]: JSONSchema; -} diff --git a/src/languageservice/parser/jsonParser07.ts b/src/languageservice/parser/jsonParser07.ts index 2e364dbb1..8d59f8158 100644 --- a/src/languageservice/parser/jsonParser07.ts +++ b/src/languageservice/parser/jsonParser07.ts @@ -5,7 +5,7 @@ *--------------------------------------------------------------------------------------------*/ import * as Json from 'jsonc-parser'; -import { JSONSchema, JSONSchemaRef } from '../jsonSchema07'; +import { JSONSchema, JSONSchemaRef } from '../jsonSchema'; import { isNumber, equals, isString, isDefined, isBoolean } from '../utils/objects'; import { ASTNode, ObjectASTNode, ArrayASTNode, BooleanASTNode, NumberASTNode, StringASTNode, NullASTNode, PropertyASTNode, BaseASTNode } from '../jsonASTTypes'; import { ErrorCode, JSONPath } from 'vscode-json-languageservice'; diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts index 0e4bb43c0..0e5f6af7c 100644 --- a/src/languageservice/services/yamlCompletion.ts +++ b/src/languageservice/services/yamlCompletion.ts @@ -9,7 +9,7 @@ import * as Parser from '../parser/jsonParser07'; import { ASTNode, ObjectASTNode, PropertyASTNode } from '../jsonASTTypes'; import { parse as parseYAML } from '../parser/yamlParser07'; import { YAMLSchemaService } from './yamlSchemaService'; -import { JSONSchema, JSONSchemaRef } from '../jsonSchema07'; +import { JSONSchema, JSONSchemaRef } from '../jsonSchema'; import { PromiseConstructor, Thenable, JSONWorkerContribution, CompletionsCollector } from 'vscode-json-languageservice'; import { CompletionItem, CompletionItemKind, CompletionList, TextDocument, Position, Range, TextEdit, InsertTextFormat, MarkupContent, MarkupKind } from 'vscode-languageserver-types'; diff --git a/src/languageservice/services/yamlSchemaService.ts b/src/languageservice/services/yamlSchemaService.ts index 862b98291..054e387d0 100644 --- a/src/languageservice/services/yamlSchemaService.ts +++ b/src/languageservice/services/yamlSchemaService.ts @@ -5,7 +5,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { JSONSchema, JSONSchemaMap, JSONSchemaRef } from '../jsonSchema07'; +import { JSONSchema, JSONSchemaMap, JSONSchemaRef } from '../jsonSchema'; import { SchemaRequestService, WorkspaceContextService, PromiseConstructor, Thenable } from '../yamlLanguageService'; import { UnresolvedSchema, ResolvedSchema, JSONSchemaService, SchemaDependencies, ISchemaContributions } from 'vscode-json-languageservice/lib/umd/services/jsonSchemaService'; diff --git a/src/languageservice/yamlLanguageService.ts b/src/languageservice/yamlLanguageService.ts index 598f741fb..4afd0d11e 100644 --- a/src/languageservice/yamlLanguageService.ts +++ b/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 './jsonSchema'; import { YAMLDocumentSymbols } from './services/documentSymbols'; import { YAMLCompletion } from './services/yamlCompletion'; import { YAMLHover } from './services/yamlHover'; diff --git a/src/server.ts b/src/server.ts index d1114e27e..da44a0a1c 100755 --- a/src/server.ts +++ b/src/server.ts @@ -17,7 +17,7 @@ import { removeDuplicatesObj } from './languageservice/utils/arrUtils'; import { getLanguageService as getCustomLanguageService, LanguageSettings, CustomFormatterOptions, WorkspaceContextService } from './languageservice/yamlLanguageService'; import * as nls from 'vscode-nls'; import { CustomSchemaProvider, FilePatternAssociation } from './languageservice/services/yamlSchemaService'; -import { JSONSchema } from './languageservice/jsonSchema04'; +import { JSONSchema } from './languageservice/jsonSchema'; import { SchemaAssociationNotification, DynamicCustomSchemaRequestRegistration, CustomSchemaRequest } from './requestTypes'; import { schemaRequestHandler } from './languageservice/services/schemaRequestHandler'; import { isRelativePath, relativeToAbsolutePath } from './languageservice/utils/paths'; diff --git a/test/schema.test.ts b/test/schema.test.ts index 52a6f8af1..be6bd57ba 100644 --- a/test/schema.test.ts +++ b/test/schema.test.ts @@ -2,7 +2,7 @@ import assert = require('assert'); import * as SchemaService from '../src/languageservice/services/yamlSchemaService'; -import * as JsonSchema from '../src/languageservice/jsonSchema07'; +import * as JsonSchema from '../src/languageservice/jsonSchema'; import fs = require('fs'); import url = require('url'); import path = require('path');