vscode-json-languageservice 5.2.0 → 5.3.0

package/lib/umd/jsonLanguageService.d.ts

@@ -1,4 +1,4 @@
-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 { 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, SortOptions } from './jsonLanguageTypes';
 import { DocumentLink } from 'vscode-languageserver-types';
 export type JSONDocument = {
     root: ASTNode | undefined;
@@ -20,10 +20,11 @@ export interface LanguageService {
     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[]>;
+    format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
+    sort(document: TextDocument, options: SortOptions): TextEdit[];
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/umd/jsonLanguageService.js

@@ -22,7 +22,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./services/jsonCompletion", "./services/jsonHover", "./services/jsonValidation", "./services/jsonDocumentSymbols", "./parser/jsonParser", "./services/configuration", "./services/jsonSchemaService", "./services/jsonFolding", "./services/jsonSelectionRanges", "jsonc-parser", "./jsonLanguageTypes", "./services/jsonLinks", "./jsonLanguageTypes"], factory);
+        define(["require", "exports", "./services/jsonCompletion", "./services/jsonHover", "./services/jsonValidation", "./services/jsonDocumentSymbols", "./parser/jsonParser", "./services/configuration", "./services/jsonSchemaService", "./services/jsonFolding", "./services/jsonSelectionRanges", "./utils/sort", "./utils/format", "./services/jsonLinks", "./jsonLanguageTypes"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -37,8 +37,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     const jsonSchemaService_1 = require("./services/jsonSchemaService");
     const jsonFolding_1 = require("./services/jsonFolding");
     const jsonSelectionRanges_1 = require("./services/jsonSelectionRanges");
-    const jsonc_parser_1 = require("jsonc-parser");
-    const jsonLanguageTypes_1 = require("./jsonLanguageTypes");
+    const sort_1 = require("./utils/sort");
+    const format_1 = require("./utils/format");
     const jsonLinks_1 = require("./services/jsonLinks");
     __exportStar(require("./jsonLanguageTypes"), exports);
     function getLanguageService(params) {
@@ -72,18 +72,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             getSelectionRanges: jsonSelectionRanges_1.getSelectionRanges,
             findDefinition: () => Promise.resolve([]),
             findLinks: jsonLinks_1.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 (0, jsonc_parser_1.format)(d.getText(), range, options).map(e => {
-                    return jsonLanguageTypes_1.TextEdit.replace(jsonLanguageTypes_1.Range.create(d.positionAt(e.offset), d.positionAt(e.offset + e.length)), e.content);
-                });
-            }
+            format: (document, range, options) => (0, format_1.format)(document, options, range),
+            sort: (document, options) => (0, sort_1.sort)(document, options)
         };
     }
     exports.getLanguageService = getLanguageService;

package/lib/umd/jsonLanguageTypes.d.ts

@@ -1,8 +1,8 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
 import { Range, Position, DocumentUri, MarkupContent, MarkupKind, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, FormattingOptions as LSPFormattingOptions, DefinitionLink, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind } from 'vscode-languageserver-types';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-export { TextDocument, Range, Position, DocumentUri, MarkupContent, MarkupKind, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, DefinitionLink, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind };
+import { TextDocument, TextDocumentContentChangeEvent } from 'vscode-languageserver-textdocument';
+export { TextDocument, TextDocumentContentChangeEvent, Range, Position, DocumentUri, MarkupContent, MarkupKind, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange, Diagnostic, DiagnosticSeverity, CompletionItem, CompletionItemKind, CompletionList, CompletionItemTag, InsertTextFormat, DefinitionLink, SymbolInformation, SymbolKind, DocumentSymbol, Location, Hover, MarkedString, CodeActionContext, Command, CodeAction, DocumentHighlight, DocumentLink, WorkspaceEdit, TextEdit, CodeActionKind, TextDocumentEdit, VersionedTextDocumentIdentifier, DocumentHighlightKind };
 /**
  * Error codes used by diagnostics
  */
@@ -295,3 +295,6 @@ export interface FormattingOptions extends LSPFormattingOptions {
     insertFinalNewline?: boolean;
     keepLines?: boolean;
 }
+export interface SortOptions extends LSPFormattingOptions {
+    insertFinalNewline?: boolean;
+}

package/lib/umd/services/jsonCompletion.js

@@ -699,7 +699,7 @@
             return text.replace(/[\\\$\}]/g, '\\$&'); // escape $, \ and } 
         }
         getInsertTextForValue(value, separatorAfter) {
-            var text = JSON.stringify(value, null, '\t');
+            const text = JSON.stringify(value, null, '\t');
             if (text === '{}') {
                 return '{$1}' + separatorAfter;
             }
@@ -817,7 +817,7 @@
                     nValueProposals += propertySchema.examples.length;
                 }
                 if (nValueProposals === 0) {
-                    var type = Array.isArray(propertySchema.type) ? propertySchema.type[0] : propertySchema.type;
+                    let type = Array.isArray(propertySchema.type) ? propertySchema.type[0] : propertySchema.type;
                     if (!type) {
                         if (propertySchema.properties) {
                             type = 'object';
@@ -857,8 +857,8 @@
             return resultText + value + separatorAfter;
         }
         getCurrentWord(document, offset) {
-            var i = offset - 1;
-            var text = document.getText();
+            let i = offset - 1;
+            const text = document.getText();
             while (i >= 0 && ' \t\n\r\v":{[,]}'.indexOf(text.charAt(i)) === -1) {
                 i--;
             }

package/lib/umd/services/jsonDocumentSymbols.js

@@ -8,7 +8,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../parser/jsonParser", "../utils/strings", "../utils/colors", "../jsonLanguageTypes"], factory);
+        define(["require", "exports", "../parser/jsonParser", "../utils/strings", "../utils/colors", "@vscode/l10n", "../jsonLanguageTypes"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -17,6 +17,7 @@
     const Parser = require("../parser/jsonParser");
     const Strings = require("../utils/strings");
     const colors_1 = require("../utils/colors");
+    const l10n = require("@vscode/l10n");
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     class JSONDocumentSymbols {
         constructor(schemaService) {
@@ -38,7 +39,7 @@
                             for (const property of item.properties) {
                                 if (property.keyNode.value === 'key' && property.valueNode) {
                                     const location = jsonLanguageTypes_1.Location.create(document.uri, getRange(document, item));
-                                    result.push({ name: Parser.getNodeValue(property.valueNode), kind: jsonLanguageTypes_1.SymbolKind.Function, location: location });
+                                    result.push({ name: getName(property.valueNode), kind: jsonLanguageTypes_1.SymbolKind.Function, location: location });
                                     limit--;
                                     if (limit <= 0) {
                                         if (context && context.onResultLimitExceeded) {
@@ -112,7 +113,7 @@
                                 if (property.keyNode.value === 'key' && property.valueNode) {
                                     const range = getRange(document, item);
                                     const selectionRange = getRange(document, property.keyNode);
-                                    result.push({ name: Parser.getNodeValue(property.valueNode), kind: jsonLanguageTypes_1.SymbolKind.Function, range, selectionRange });
+                                    result.push({ name: getName(property.valueNode), kind: jsonLanguageTypes_1.SymbolKind.Function, range, selectionRange });
                                     limit--;
                                     if (limit <= 0) {
                                         if (context && context.onResultLimitExceeded) {
@@ -278,4 +279,7 @@
     function getRange(document, node) {
         return jsonLanguageTypes_1.Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
     }
+    function getName(node) {
+        return Parser.getNodeValue(node) || l10n.t('<empty>');
+    }
 });

package/lib/umd/services/jsonHover.js

@@ -40,7 +40,7 @@
                 }
             }
             const hoverRange = jsonLanguageTypes_1.Range.create(document.positionAt(hoverRangeNode.offset), document.positionAt(hoverRangeNode.offset + hoverRangeNode.length));
-            var createHover = (contents) => {
+            const createHover = (contents) => {
                 const result = {
                     contents: contents,
                     range: hoverRange

package/lib/umd/utils/format.js

@@ -0,0 +1,34 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "jsonc-parser", "../jsonLanguageTypes"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.format = void 0;
+    const jsonc_parser_1 = require("jsonc-parser");
+    const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
+    function format(documentToFormat, formattingOptions, formattingRange) {
+        let range = undefined;
+        if (formattingRange) {
+            const offset = documentToFormat.offsetAt(formattingRange.start);
+            const length = documentToFormat.offsetAt(formattingRange.end) - offset;
+            range = { offset, length };
+        }
+        const options = {
+            tabSize: formattingOptions ? formattingOptions.tabSize : 4,
+            insertSpaces: formattingOptions?.insertSpaces === true,
+            insertFinalNewline: formattingOptions?.insertFinalNewline === true,
+            eol: '\n',
+            keepLines: formattingOptions?.keepLines === true
+        };
+        return (0, jsonc_parser_1.format)(documentToFormat.getText(), range, options).map(edit => {
+            return jsonLanguageTypes_1.TextEdit.replace(jsonLanguageTypes_1.Range.create(documentToFormat.positionAt(edit.offset), documentToFormat.positionAt(edit.offset + edit.length)), edit.content);
+        });
+    }
+    exports.format = format;
+});

package/lib/umd/utils/objects.js

@@ -30,7 +30,7 @@
         if ((Array.isArray(one)) !== (Array.isArray(other))) {
             return false;
         }
-        var i, key;
+        let i, key;
         if (Array.isArray(one)) {
             if (one.length !== other.length) {
                 return false;
@@ -42,12 +42,12 @@
             }
         }
         else {
-            var oneKeys = [];
+            const oneKeys = [];
             for (key in one) {
                 oneKeys.push(key);
             }
             oneKeys.sort();
-            var otherKeys = [];
+            const otherKeys = [];
             for (key in other) {
                 otherKeys.push(key);
             }

package/lib/umd/utils/propertyTree.js

@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.PropertyTree = exports.Container = void 0;
+    var Container;
+    (function (Container) {
+        Container[Container["Object"] = 0] = "Object";
+        Container[Container["Array"] = 1] = "Array";
+    })(Container = exports.Container || (exports.Container = {}));
+    class PropertyTree {
+        constructor(propertyName, beginningLineNumber) {
+            this.propertyName = propertyName ?? '';
+            this.beginningLineNumber = beginningLineNumber;
+            this.childrenProperties = [];
+            this.lastProperty = false;
+            this.noKeyName = false;
+        }
+        addChildProperty(childProperty) {
+            childProperty.parent = this;
+            if (this.childrenProperties.length > 0) {
+                let insertionIndex = 0;
+                if (childProperty.noKeyName) {
+                    insertionIndex = this.childrenProperties.length;
+                }
+                else {
+                    insertionIndex = binarySearchOnPropertyArray(this.childrenProperties, childProperty, compareProperties);
+                }
+                if (insertionIndex < 0) {
+                    insertionIndex = (insertionIndex * -1) - 1;
+                }
+                this.childrenProperties.splice(insertionIndex, 0, childProperty);
+            }
+            else {
+                this.childrenProperties.push(childProperty);
+            }
+            return childProperty;
+        }
+    }
+    exports.PropertyTree = PropertyTree;
+    function compareProperties(propertyTree1, propertyTree2) {
+        if (propertyTree1.propertyName < propertyTree2.propertyName) {
+            return -1;
+        }
+        else if (propertyTree1.propertyName > propertyTree2.propertyName) {
+            return 1;
+        }
+        return 0;
+    }
+    function binarySearchOnPropertyArray(propertyTreeArray, propertyTree, compare_fn) {
+        if (propertyTree.propertyName < propertyTreeArray[0].propertyName) {
+            return 0;
+        }
+        if (propertyTree.propertyName > propertyTreeArray[propertyTreeArray.length - 1].propertyName) {
+            return propertyTreeArray.length;
+        }
+        let m = 0;
+        let n = propertyTreeArray.length - 1;
+        while (m <= n) {
+            let k = (n + m) >> 1;
+            let cmp = compare_fn(propertyTree, propertyTreeArray[k]);
+            if (cmp > 0) {
+                m = k + 1;
+            }
+            else if (cmp < 0) {
+                n = k - 1;
+            }
+            else {
+                return k;
+            }
+        }
+        return -m - 1;
+    }
+});