Merge branch 'master' into add-delete-modify-api

Author: JPinkney

src/languageservice/jsonASTTypes.ts

@@ -12,6 +12,8 @@ export interface BaseASTNode {
     readonly length: number;
     readonly children?: ASTNode[];
     readonly value?: string | boolean | number | null;
+    location: string;
+    getNodeFromOffsetEndInclusive(offset: number): ASTNode;
 }
 export interface ObjectASTNode extends BaseASTNode {
     readonly type: 'object';

src/languageservice/jsonSchema07.ts src/languageservice/jsonSchema.tssrc/languageservice/jsonSchema07.ts renamed to src/languageservice/jsonSchema.ts

@@ -64,7 +64,8 @@ export interface JSONSchema {
         markdownDescription?: string;
         // tslint:disable-next-line: no-any
         body?: any;
-        bodyText?: string; }[]; // VSCode extension: body: a object that will be converted to a JSON string. bodyText: text with \t and \n
+        bodyText?: string;
+    }[]; // VSCode extension: body: a object that will be converted to a JSON string. bodyText: text with \t and \n
 
     errorMessage?: string; // VSCode extension
     patternErrorMessage?: string; // VSCode extension