vscode-json-languageservice 5.0.0 → 5.1.1

package/CHANGELOG.md

@@ -1,11 +1,19 @@
+5.2.0 / 2022-08/19
+================
+* new type `SchemaDraft`, representing the offical JSON schema draft versions
+* new property `DocumentLanguageSettings.schemaDraft` to specify the schema version to use, if the schema does not contain a `$schema` property
+
+5.1.0 / 2022-07-11
+================
+* new API option `FormattingOptions.keepLines` to indicate the formatter should keep the initial line positions 
+
 5.0.0 / 2022-05-17
 ================
- * Update to `vscode-languageserver-types@3.16`
+ * Update to `vscode-languageserver-types@3.17`
  * Add more schema support 
    * Schema 2019-09: unevaluatedProperties, unevaluatedItems, minContains, maxContains, deprecated, dependentRequired, dependentSchemas, $defs, $anchor
    * Schema 2020-12: prefixItem
 
-
 4.2.0 / 2022-01-25
 ================
  * new API `LanguageService.getLanguageStatus`

package/lib/esm/jsonContributions.d.ts

@@ -1,17 +1,17 @@
-import { Thenable, MarkedString, CompletionItem } from './jsonLanguageService';
-export interface JSONWorkerContribution {
-    getInfoContribution(uri: string, location: JSONPath): Thenable<MarkedString[]>;
-    collectPropertyCompletions(uri: string, location: JSONPath, currentWord: string, addValue: boolean, isLast: boolean, result: CompletionsCollector): Thenable<any>;
-    collectValueCompletions(uri: string, location: JSONPath, propertyKey: string, result: CompletionsCollector): Thenable<any>;
-    collectDefaultCompletions(uri: string, result: CompletionsCollector): Thenable<any>;
-    resolveCompletion?(item: CompletionItem): Thenable<CompletionItem>;
-}
-export declare type Segment = string | number;
-export declare type JSONPath = Segment[];
-export interface CompletionsCollector {
-    add(suggestion: CompletionItem): void;
-    error(message: string): void;
-    log(message: string): void;
-    setAsIncomplete(): void;
-    getNumberOfProposals(): number;
-}
+import { Thenable, MarkedString, CompletionItem } from './jsonLanguageService';
+export interface JSONWorkerContribution {
+    getInfoContribution(uri: string, location: JSONPath): Thenable<MarkedString[]>;
+    collectPropertyCompletions(uri: string, location: JSONPath, currentWord: string, addValue: boolean, isLast: boolean, result: CompletionsCollector): Thenable<any>;
+    collectValueCompletions(uri: string, location: JSONPath, propertyKey: string, result: CompletionsCollector): Thenable<any>;
+    collectDefaultCompletions(uri: string, result: CompletionsCollector): Thenable<any>;
+    resolveCompletion?(item: CompletionItem): Thenable<CompletionItem>;
+}
+export declare type Segment = string | number;
+export declare type JSONPath = Segment[];
+export interface CompletionsCollector {
+    add(suggestion: CompletionItem): void;
+    error(message: string): void;
+    log(message: string): void;
+    setAsIncomplete(): void;
+    getNumberOfProposals(): number;
+}

package/lib/esm/jsonContributions.js

@@ -1 +1 @@
-export {};
+export {};

package/lib/esm/jsonLanguageService.d.ts

@@ -1,29 +1,29 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema, JSONLanguageStatus } from './jsonLanguageTypes';
-import { DocumentLink } from 'vscode-languageserver-types';
-export declare type JSONDocument = {
-    root: ASTNode | undefined;
-    getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
-};
-export * from './jsonLanguageTypes';
-export interface LanguageService {
-    configure(settings: LanguageSettings): void;
-    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): Thenable<Diagnostic[]>;
-    parseJSONDocument(document: TextDocument): JSONDocument;
-    newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
-    resetSchema(uri: string): boolean;
-    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
-    getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
-    doResolve(item: CompletionItem): Thenable<CompletionItem>;
-    doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
-    findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];
-    findDocumentSymbols2(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): DocumentSymbol[];
-    findDocumentColors(document: TextDocument, doc: JSONDocument, context?: DocumentColorsContext): Thenable<ColorInformation[]>;
-    getColorPresentations(document: TextDocument, doc: JSONDocument, color: Color, range: Range): ColorPresentation[];
-    doHover(document: TextDocument, position: Position, doc: JSONDocument): Thenable<Hover | null>;
-    format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
-    getFoldingRanges(document: TextDocument, context?: FoldingRangesContext): FoldingRange[];
-    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
-    findDefinition(document: TextDocument, position: Position, doc: JSONDocument): Thenable<DefinitionLink[]>;
-    findLinks(document: TextDocument, doc: JSONDocument): Thenable<DocumentLink[]>;
-}
-export declare function getLanguageService(params: LanguageServiceParams): LanguageService;
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema, JSONLanguageStatus } from './jsonLanguageTypes';
+import { DocumentLink } from 'vscode-languageserver-types';
+export declare type JSONDocument = {
+    root: ASTNode | undefined;
+    getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
+};
+export * from './jsonLanguageTypes';
+export interface LanguageService {
+    configure(settings: LanguageSettings): void;
+    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): Thenable<Diagnostic[]>;
+    parseJSONDocument(document: TextDocument): JSONDocument;
+    newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
+    resetSchema(uri: string): boolean;
+    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
+    getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
+    doResolve(item: CompletionItem): Thenable<CompletionItem>;
+    doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
+    findDocumentSymbols(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): SymbolInformation[];
+    findDocumentSymbols2(document: TextDocument, doc: JSONDocument, context?: DocumentSymbolsContext): DocumentSymbol[];
+    findDocumentColors(document: TextDocument, doc: JSONDocument, context?: DocumentColorsContext): Thenable<ColorInformation[]>;
+    getColorPresentations(document: TextDocument, doc: JSONDocument, color: Color, range: Range): ColorPresentation[];
+    doHover(document: TextDocument, position: Position, doc: JSONDocument): Thenable<Hover | null>;
+    format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
+    getFoldingRanges(document: TextDocument, context?: FoldingRangesContext): FoldingRange[];
+    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
+    findDefinition(document: TextDocument, position: Position, doc: JSONDocument): Thenable<DefinitionLink[]>;
+    findLinks(document: TextDocument, doc: JSONDocument): Thenable<DocumentLink[]>;
+}
+export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/esm/jsonLanguageService.js

@@ -1,66 +1,66 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import { JSONCompletion } from './services/jsonCompletion';
-import { JSONHover } from './services/jsonHover';
-import { JSONValidation } from './services/jsonValidation';
-import { JSONDocumentSymbols } from './services/jsonDocumentSymbols';
-import { parse as parseJSON, newJSONDocument } from './parser/jsonParser';
-import { schemaContributions } from './services/configuration';
-import { JSONSchemaService } from './services/jsonSchemaService';
-import { getFoldingRanges } from './services/jsonFolding';
-import { getSelectionRanges } from './services/jsonSelectionRanges';
-import { format as formatJSON } from 'jsonc-parser';
-import { Range, TextEdit } from './jsonLanguageTypes';
-import { findLinks } from './services/jsonLinks';
-export * from './jsonLanguageTypes';
-export function getLanguageService(params) {
-    const promise = params.promiseConstructor || Promise;
-    const jsonSchemaService = new JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
-    jsonSchemaService.setSchemaContributions(schemaContributions);
-    const jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
-    const jsonHover = new JSONHover(jsonSchemaService, params.contributions, promise);
-    const jsonDocumentSymbols = new JSONDocumentSymbols(jsonSchemaService);
-    const jsonValidation = new JSONValidation(jsonSchemaService, promise);
-    return {
-        configure: (settings) => {
-            jsonSchemaService.clearExternalSchemas();
-            if (settings.schemas) {
-                settings.schemas.forEach(settings => {
-                    jsonSchemaService.registerExternalSchema(settings.uri, settings.fileMatch, settings.schema);
-                });
-            }
-            jsonValidation.configure(settings);
-        },
-        resetSchema: (uri) => jsonSchemaService.onResourceChange(uri),
-        doValidation: jsonValidation.doValidation.bind(jsonValidation),
-        getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
-        parseJSONDocument: (document) => parseJSON(document, { collectComments: true }),
-        newJSONDocument: (root, diagnostics) => newJSONDocument(root, diagnostics),
-        getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
-        doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
-        doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
-        findDocumentSymbols: jsonDocumentSymbols.findDocumentSymbols.bind(jsonDocumentSymbols),
-        findDocumentSymbols2: jsonDocumentSymbols.findDocumentSymbols2.bind(jsonDocumentSymbols),
-        findDocumentColors: jsonDocumentSymbols.findDocumentColors.bind(jsonDocumentSymbols),
-        getColorPresentations: jsonDocumentSymbols.getColorPresentations.bind(jsonDocumentSymbols),
-        doHover: jsonHover.doHover.bind(jsonHover),
-        getFoldingRanges,
-        getSelectionRanges,
-        findDefinition: () => Promise.resolve([]),
-        findLinks,
-        format: (d, r, o) => {
-            let range = undefined;
-            if (r) {
-                const offset = d.offsetAt(r.start);
-                const length = d.offsetAt(r.end) - offset;
-                range = { offset, length };
-            }
-            const options = { tabSize: o ? o.tabSize : 4, insertSpaces: o?.insertSpaces === true, insertFinalNewline: o?.insertFinalNewline === true, eol: '\n' };
-            return formatJSON(d.getText(), range, options).map(e => {
-                return TextEdit.replace(Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
-            });
-        }
-    };
-}
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { JSONCompletion } from './services/jsonCompletion';
+import { JSONHover } from './services/jsonHover';
+import { JSONValidation } from './services/jsonValidation';
+import { JSONDocumentSymbols } from './services/jsonDocumentSymbols';
+import { parse as parseJSON, newJSONDocument } from './parser/jsonParser';
+import { schemaContributions } from './services/configuration';
+import { JSONSchemaService } from './services/jsonSchemaService';
+import { getFoldingRanges } from './services/jsonFolding';
+import { getSelectionRanges } from './services/jsonSelectionRanges';
+import { format as formatJSON } from 'jsonc-parser';
+import { Range, TextEdit } from './jsonLanguageTypes';
+import { findLinks } from './services/jsonLinks';
+export * from './jsonLanguageTypes';
+export function getLanguageService(params) {
+    const promise = params.promiseConstructor || Promise;
+    const jsonSchemaService = new JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
+    jsonSchemaService.setSchemaContributions(schemaContributions);
+    const jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
+    const jsonHover = new JSONHover(jsonSchemaService, params.contributions, promise);
+    const jsonDocumentSymbols = new JSONDocumentSymbols(jsonSchemaService);
+    const jsonValidation = new JSONValidation(jsonSchemaService, promise);
+    return {
+        configure: (settings) => {
+            jsonSchemaService.clearExternalSchemas();
+            if (settings.schemas) {
+                settings.schemas.forEach(settings => {
+                    jsonSchemaService.registerExternalSchema(settings.uri, settings.fileMatch, settings.schema);
+                });
+            }
+            jsonValidation.configure(settings);
+        },
+        resetSchema: (uri) => jsonSchemaService.onResourceChange(uri),
+        doValidation: jsonValidation.doValidation.bind(jsonValidation),
+        getLanguageStatus: jsonValidation.getLanguageStatus.bind(jsonValidation),
+        parseJSONDocument: (document) => parseJSON(document, { collectComments: true }),
+        newJSONDocument: (root, diagnostics) => newJSONDocument(root, diagnostics),
+        getMatchingSchemas: jsonSchemaService.getMatchingSchemas.bind(jsonSchemaService),
+        doResolve: jsonCompletion.doResolve.bind(jsonCompletion),
+        doComplete: jsonCompletion.doComplete.bind(jsonCompletion),
+        findDocumentSymbols: jsonDocumentSymbols.findDocumentSymbols.bind(jsonDocumentSymbols),
+        findDocumentSymbols2: jsonDocumentSymbols.findDocumentSymbols2.bind(jsonDocumentSymbols),
+        findDocumentColors: jsonDocumentSymbols.findDocumentColors.bind(jsonDocumentSymbols),
+        getColorPresentations: jsonDocumentSymbols.getColorPresentations.bind(jsonDocumentSymbols),
+        doHover: jsonHover.doHover.bind(jsonHover),
+        getFoldingRanges,
+        getSelectionRanges,
+        findDefinition: () => Promise.resolve([]),
+        findLinks,
+        format: (d, r, o) => {
+            let range = undefined;
+            if (r) {
+                const offset = d.offsetAt(r.start);
+                const length = d.offsetAt(r.end) - offset;
+                range = { offset, length };
+            }
+            const options = { tabSize: o ? o.tabSize : 4, insertSpaces: o?.insertSpaces === true, insertFinalNewline: o?.insertFinalNewline === true, eol: '\n', keepLines: o?.keepLines === true };
+            return formatJSON(d.getText(), range, options).map(e => {
+                return TextEdit.replace(Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
+            });
+        }
+    };
+}