Merge 0725387 into 76e1472

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';

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';

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';

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';

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';

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');