vscode-json-languageservice 5.3.11 → 5.4.1

package/lib/esm/jsonContributions.d.ts

@@ -1,10 +1,10 @@
-import { Thenable, MarkedString, CompletionItem } from './jsonLanguageService';
+import { 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>;
+    getInfoContribution(uri: string, location: JSONPath): PromiseLike<MarkedString[]>;
+    collectPropertyCompletions(uri: string, location: JSONPath, currentWord: string, addValue: boolean, isLast: boolean, result: CompletionsCollector): PromiseLike<any>;
+    collectValueCompletions(uri: string, location: JSONPath, propertyKey: string, result: CompletionsCollector): PromiseLike<any>;
+    collectDefaultCompletions(uri: string, result: CompletionsCollector): PromiseLike<any>;
+    resolveCompletion?(item: CompletionItem): PromiseLike<CompletionItem>;
 }
 export type Segment = string | number;
 export type JSONPath = Segment[];

package/lib/esm/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, SortOptions } from './jsonLanguageTypes';
+import { 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;
@@ -7,23 +7,23 @@ export type JSONDocument = {
 export * from './jsonLanguageTypes';
 export interface LanguageService {
     configure(settings: LanguageSettings): void;
-    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): Thenable<Diagnostic[]>;
+    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): PromiseLike<Diagnostic[]>;
     parseJSONDocument(document: TextDocument): JSONDocument;
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
-    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
+    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): PromiseLike<MatchingSchema[]>;
     getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
-    doResolve(item: CompletionItem): Thenable<CompletionItem>;
-    doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
+    doResolve(item: CompletionItem): PromiseLike<CompletionItem>;
+    doComplete(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<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[]>;
+    findDocumentColors(document: TextDocument, doc: JSONDocument, context?: DocumentColorsContext): PromiseLike<ColorInformation[]>;
     getColorPresentations(document: TextDocument, doc: JSONDocument, color: Color, range: Range): ColorPresentation[];
-    doHover(document: TextDocument, position: Position, doc: JSONDocument): Thenable<Hover | null>;
+    doHover(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<Hover | null>;
     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[]>;
+    findDefinition(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<DefinitionLink[]>;
+    findLinks(document: TextDocument, doc: JSONDocument): PromiseLike<DocumentLink[]>;
     format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
     sort(document: TextDocument, options: SortOptions): TextEdit[];
 }

package/lib/esm/jsonLanguageTypes.d.ts

@@ -156,7 +156,7 @@ export interface WorkspaceContextService {
  * In case of an error, returns a rejected promise with a displayable error string.
  */
 export interface SchemaRequestService {
-    (uri: string): Thenable<string>;
+    (uri: string): PromiseLike<string>;
 }
 export interface PromiseConstructor {
     /**
@@ -165,36 +165,33 @@ export interface PromiseConstructor {
      * a resolve callback used resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
-    new <T>(executor: (resolve: (value?: T | Thenable<T | undefined>) => void, reject: (reason?: any) => void) => void): Thenable<T | undefined>;
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T | undefined>) => void, reject: (reason?: any) => void) => void): PromiseLike<T | undefined>;
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
      * resolve, or rejected when any Promise is rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T>(values: Array<T | Thenable<T>>): Thenable<T[]>;
+    all<T>(values: Array<T | PromiseLike<T>>): PromiseLike<T[]>;
     /**
      * Creates a new rejected promise for the provided reason.
      * @param reason The reason the promise was rejected.
      * @returns A new rejected Promise.
      */
-    reject<T>(reason: any): Thenable<T>;
+    reject<T>(reason: any): PromiseLike<T>;
     /**
          * Creates a new resolved promise for the provided value.
          * @param value A promise.
          * @returns A promise whose internal state matches the provided promise.
          */
-    resolve<T>(value: T | Thenable<T>): Thenable<T>;
+    resolve<T>(value: T | PromiseLike<T>): PromiseLike<T>;
 }
-export interface Thenable<R> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: R) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
-    then<TResult>(onfulfilled?: (value: R) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
+/**
+ * A deprecated alias of {@link PromiseLike}
+ *
+ * @deprecated
+ */
+export interface Thenable<R> extends PromiseLike<R> {
 }
 export interface LanguageServiceParams {
     /**

package/lib/esm/utils/sort.js

@@ -2,7 +2,6 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-// import { TextEdit} from 'vscode-languageserver-textdocument';
 import { createScanner } from 'jsonc-parser';
 import { TextDocument, TextEdit, Position, Range } from '../jsonLanguageTypes';
 import { format } from './format';
@@ -322,6 +321,13 @@ function sortJsoncDocument(jsonDocument, propertyTree) {
     }
     return sortedJsonDocument;
 }
+function sortPropertiesCaseSensitive(properties) {
+    properties.sort((a, b) => {
+        const aName = a.propertyName ?? '';
+        const bName = b.propertyName ?? '';
+        return aName < bName ? -1 : aName > bName ? 1 : 0;
+    });
+}
 function updateSortingQueue(queue, propertyTree, beginningLineNumber) {
     if (propertyTree.childrenProperties.length === 0) {
         return;
@@ -335,6 +341,7 @@ function updateSortingQueue(queue, propertyTree, beginningLineNumber) {
         }
         const diff = minimumBeginningLineNumber - propertyTree.beginningLineNumber;
         beginningLineNumber = beginningLineNumber + diff;
+        sortPropertiesCaseSensitive(propertyTree.childrenProperties);
         queue.push(new SortingRange(beginningLineNumber, propertyTree.childrenProperties));
     }
     else if (propertyTree.type === Container.Array) {

package/lib/umd/jsonContributions.d.ts

@@ -1,10 +1,10 @@
-import { Thenable, MarkedString, CompletionItem } from './jsonLanguageService';
+import { 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>;
+    getInfoContribution(uri: string, location: JSONPath): PromiseLike<MarkedString[]>;
+    collectPropertyCompletions(uri: string, location: JSONPath, currentWord: string, addValue: boolean, isLast: boolean, result: CompletionsCollector): PromiseLike<any>;
+    collectValueCompletions(uri: string, location: JSONPath, propertyKey: string, result: CompletionsCollector): PromiseLike<any>;
+    collectDefaultCompletions(uri: string, result: CompletionsCollector): PromiseLike<any>;
+    resolveCompletion?(item: CompletionItem): PromiseLike<CompletionItem>;
 }
 export type Segment = string | number;
 export type JSONPath = Segment[];

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, SortOptions } from './jsonLanguageTypes';
+import { 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;
@@ -7,23 +7,23 @@ export type JSONDocument = {
 export * from './jsonLanguageTypes';
 export interface LanguageService {
     configure(settings: LanguageSettings): void;
-    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): Thenable<Diagnostic[]>;
+    doValidation(document: TextDocument, jsonDocument: JSONDocument, documentSettings?: DocumentLanguageSettings, schema?: JSONSchema): PromiseLike<Diagnostic[]>;
     parseJSONDocument(document: TextDocument): JSONDocument;
     newJSONDocument(rootNode: ASTNode, syntaxDiagnostics?: Diagnostic[]): JSONDocument;
     resetSchema(uri: string): boolean;
-    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): Thenable<MatchingSchema[]>;
+    getMatchingSchemas(document: TextDocument, jsonDocument: JSONDocument, schema?: JSONSchema): PromiseLike<MatchingSchema[]>;
     getLanguageStatus(document: TextDocument, jsonDocument: JSONDocument): JSONLanguageStatus;
-    doResolve(item: CompletionItem): Thenable<CompletionItem>;
-    doComplete(document: TextDocument, position: Position, doc: JSONDocument): Thenable<CompletionList | null>;
+    doResolve(item: CompletionItem): PromiseLike<CompletionItem>;
+    doComplete(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<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[]>;
+    findDocumentColors(document: TextDocument, doc: JSONDocument, context?: DocumentColorsContext): PromiseLike<ColorInformation[]>;
     getColorPresentations(document: TextDocument, doc: JSONDocument, color: Color, range: Range): ColorPresentation[];
-    doHover(document: TextDocument, position: Position, doc: JSONDocument): Thenable<Hover | null>;
+    doHover(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<Hover | null>;
     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[]>;
+    findDefinition(document: TextDocument, position: Position, doc: JSONDocument): PromiseLike<DefinitionLink[]>;
+    findLinks(document: TextDocument, doc: JSONDocument): PromiseLike<DocumentLink[]>;
     format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
     sort(document: TextDocument, options: SortOptions): TextEdit[];
 }

package/lib/umd/jsonLanguageService.js

@@ -27,7 +27,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getLanguageService = void 0;
+    exports.getLanguageService = getLanguageService;
     const jsonCompletion_1 = require("./services/jsonCompletion");
     const jsonHover_1 = require("./services/jsonHover");
     const jsonValidation_1 = require("./services/jsonValidation");
@@ -76,5 +76,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             sort: (document, options) => (0, sort_1.sort)(document, options)
         };
     }
-    exports.getLanguageService = getLanguageService;
 });

package/lib/umd/jsonLanguageTypes.d.ts

@@ -156,7 +156,7 @@ export interface WorkspaceContextService {
  * In case of an error, returns a rejected promise with a displayable error string.
  */
 export interface SchemaRequestService {
-    (uri: string): Thenable<string>;
+    (uri: string): PromiseLike<string>;
 }
 export interface PromiseConstructor {
     /**
@@ -165,36 +165,33 @@ export interface PromiseConstructor {
      * a resolve callback used resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
-    new <T>(executor: (resolve: (value?: T | Thenable<T | undefined>) => void, reject: (reason?: any) => void) => void): Thenable<T | undefined>;
+    new <T>(executor: (resolve: (value?: T | PromiseLike<T | undefined>) => void, reject: (reason?: any) => void) => void): PromiseLike<T | undefined>;
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
      * resolve, or rejected when any Promise is rejected.
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T>(values: Array<T | Thenable<T>>): Thenable<T[]>;
+    all<T>(values: Array<T | PromiseLike<T>>): PromiseLike<T[]>;
     /**
      * Creates a new rejected promise for the provided reason.
      * @param reason The reason the promise was rejected.
      * @returns A new rejected Promise.
      */
-    reject<T>(reason: any): Thenable<T>;
+    reject<T>(reason: any): PromiseLike<T>;
     /**
          * Creates a new resolved promise for the provided value.
          * @param value A promise.
          * @returns A promise whose internal state matches the provided promise.
          */
-    resolve<T>(value: T | Thenable<T>): Thenable<T>;
+    resolve<T>(value: T | PromiseLike<T>): PromiseLike<T>;
 }
-export interface Thenable<R> {
-    /**
-    * Attaches callbacks for the resolution and/or rejection of the Promise.
-    * @param onfulfilled The callback to execute when the Promise is resolved.
-    * @param onrejected The callback to execute when the Promise is rejected.
-    * @returns A Promise for the completion of which ever callback is executed.
-    */
-    then<TResult>(onfulfilled?: (value: R) => TResult | Thenable<TResult>, onrejected?: (reason: any) => TResult | Thenable<TResult>): Thenable<TResult>;
-    then<TResult>(onfulfilled?: (value: R) => TResult | Thenable<TResult>, onrejected?: (reason: any) => void): Thenable<TResult>;
+/**
+ * A deprecated alias of {@link PromiseLike}
+ *
+ * @deprecated
+ */
+export interface Thenable<R> extends PromiseLike<R> {
 }
 export interface LanguageServiceParams {
     /**

package/lib/umd/parser/jsonParser.js

@@ -13,7 +13,13 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.parse = exports.JSONDocument = exports.contains = exports.getNodePath = exports.getNodeValue = exports.newJSONDocument = exports.ValidationResult = exports.EnumMatch = exports.asSchema = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = void 0;
+    exports.JSONDocument = exports.ValidationResult = exports.EnumMatch = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = void 0;
+    exports.asSchema = asSchema;
+    exports.newJSONDocument = newJSONDocument;
+    exports.getNodeValue = getNodeValue;
+    exports.getNodePath = getNodePath;
+    exports.contains = contains;
+    exports.parse = parse;
     const Json = require("jsonc-parser");
     const objects_1 = require("../utils/objects");
     const strings_1 = require("../utils/strings");
@@ -116,7 +122,6 @@
         }
         return schema;
     }
-    exports.asSchema = asSchema;
     var EnumMatch;
     (function (EnumMatch) {
         EnumMatch[EnumMatch["Key"] = 0] = "Key";
@@ -226,19 +231,15 @@
     function newJSONDocument(root, diagnostics = []) {
         return new JSONDocument(root, diagnostics, []);
     }
-    exports.newJSONDocument = newJSONDocument;
     function getNodeValue(node) {
         return Json.getNodeValue(node);
     }
-    exports.getNodeValue = getNodeValue;
     function getNodePath(node) {
         return Json.getNodePath(node);
     }
-    exports.getNodePath = getNodePath;
     function contains(node, offset, includeRightBound = false) {
         return offset >= node.offset && offset < (node.offset + node.length) || includeRightBound && offset === (node.offset + node.length);
     }
-    exports.contains = contains;
     class JSONDocument {
         constructor(root, syntaxErrors = [], comments = []) {
             this.root = root;
@@ -1269,5 +1270,4 @@
         }
         return new JSONDocument(_root, problems, commentRanges);
     }
-    exports.parse = parse;
 });

package/lib/umd/services/jsonFolding.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getFoldingRanges = void 0;
+    exports.getFoldingRanges = getFoldingRanges;
     const jsonc_parser_1 = require("jsonc-parser");
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function getFoldingRanges(document, context) {
@@ -130,5 +130,4 @@
         }
         return result;
     }
-    exports.getFoldingRanges = getFoldingRanges;
 });

package/lib/umd/services/jsonLinks.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.findLinks = void 0;
+    exports.findLinks = findLinks;
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function findLinks(document, doc) {
         const links = [];
@@ -33,7 +33,6 @@
         });
         return Promise.resolve(links);
     }
-    exports.findLinks = findLinks;
     function createRange(document, node) {
         return jsonLanguageTypes_1.Range.create(document.positionAt(node.offset + 1), document.positionAt(node.offset + node.length - 1));
     }

package/lib/umd/services/jsonSelectionRanges.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.getSelectionRanges = void 0;
+    exports.getSelectionRanges = getSelectionRanges;
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     const jsonc_parser_1 = require("jsonc-parser");
     function getSelectionRanges(document, positions, doc) {
@@ -71,5 +71,4 @@
         }
         return positions.map(getSelectionRange);
     }
-    exports.getSelectionRanges = getSelectionRanges;
 });

package/lib/umd/utils/colors.js

@@ -13,7 +13,9 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.colorFrom256RGB = exports.colorFromHex = exports.hexDigit = void 0;
+    exports.hexDigit = hexDigit;
+    exports.colorFromHex = colorFromHex;
+    exports.colorFrom256RGB = colorFrom256RGB;
     const Digit0 = 48;
     const Digit9 = 57;
     const A = 65;
@@ -34,7 +36,6 @@
         }
         return 0;
     }
-    exports.hexDigit = hexDigit;
     function colorFromHex(text) {
         if (text[0] !== '#') {
             return undefined;
@@ -71,7 +72,6 @@
         }
         return undefined;
     }
-    exports.colorFromHex = colorFromHex;
     function colorFrom256RGB(red, green, blue, alpha = 1.0) {
         return {
             red: red / 255.0,
@@ -80,5 +80,4 @@
             alpha
         };
     }
-    exports.colorFrom256RGB = colorFrom256RGB;
 });

package/lib/umd/utils/format.js

@@ -9,7 +9,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.format = void 0;
+    exports.format = format;
     const jsonc_parser_1 = require("jsonc-parser");
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function format(documentToFormat, formattingOptions, formattingRange) {
@@ -30,5 +30,4 @@
             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/glob.js

@@ -9,7 +9,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.createRegex = void 0;
+    exports.createRegex = createRegex;
     /*---------------------------------------------------------------------------------------------
      *  Copyright (c) Microsoft Corporation. All rights reserved.
      *  Copyright (c) 2013, Nick Fitzgerald
@@ -133,6 +133,5 @@
         }
         return new RegExp(reStr, flags);
     }
-    exports.createRegex = createRegex;
     ;
 });

package/lib/umd/utils/json.js

@@ -13,7 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.stringifyObject = void 0;
+    exports.stringifyObject = stringifyObject;
     function stringifyObject(obj, indent, stringifyLiteral) {
         if (obj !== null && typeof obj === 'object') {
             const newIndent = indent + '\t';
@@ -52,5 +52,4 @@
         }
         return stringifyLiteral(obj);
     }
-    exports.stringifyObject = stringifyObject;
 });

package/lib/umd/utils/objects.js

@@ -13,7 +13,12 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isObject = exports.isString = exports.isBoolean = exports.isDefined = exports.isNumber = exports.equals = void 0;
+    exports.equals = equals;
+    exports.isNumber = isNumber;
+    exports.isDefined = isDefined;
+    exports.isBoolean = isBoolean;
+    exports.isString = isString;
+    exports.isObject = isObject;
     function equals(one, other) {
         if (one === other) {
             return true;
@@ -63,25 +68,19 @@
         }
         return true;
     }
-    exports.equals = equals;
     function isNumber(val) {
         return typeof val === 'number';
     }
-    exports.isNumber = isNumber;
     function isDefined(val) {
         return typeof val !== 'undefined';
     }
-    exports.isDefined = isDefined;
     function isBoolean(val) {
         return typeof val === 'boolean';
     }
-    exports.isBoolean = isBoolean;
     function isString(val) {
         return typeof val === 'string';
     }
-    exports.isString = isString;
     function isObject(val) {
         return typeof val === 'object' && val !== null && !Array.isArray(val);
     }
-    exports.isObject = isObject;
 });

package/lib/umd/utils/sort.js

@@ -13,8 +13,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.sort = void 0;
-    // import { TextEdit} from 'vscode-languageserver-textdocument';
+    exports.sort = sort;
     const jsonc_parser_1 = require("jsonc-parser");
     const jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     const format_1 = require("./format");
@@ -32,7 +31,6 @@
         const sortedAndFormattedJsonDocument = jsonLanguageTypes_1.TextDocument.applyEdits(sortedJsonDocument, edits);
         return [jsonLanguageTypes_1.TextEdit.replace(jsonLanguageTypes_1.Range.create(jsonLanguageTypes_1.Position.create(0, 0), documentToSort.positionAt(documentToSort.getText().length)), sortedAndFormattedJsonDocument)];
     }
-    exports.sort = sort;
     function findJsoncPropertyTree(formattedDocument) {
         const formattedString = formattedDocument.getText();
         const scanner = (0, jsonc_parser_1.createScanner)(formattedString, false);
@@ -335,6 +333,13 @@
         }
         return sortedJsonDocument;
     }
+    function sortPropertiesCaseSensitive(properties) {
+        properties.sort((a, b) => {
+            const aName = a.propertyName ?? '';
+            const bName = b.propertyName ?? '';
+            return aName < bName ? -1 : aName > bName ? 1 : 0;
+        });
+    }
     function updateSortingQueue(queue, propertyTree, beginningLineNumber) {
         if (propertyTree.childrenProperties.length === 0) {
             return;
@@ -348,6 +353,7 @@
             }
             const diff = minimumBeginningLineNumber - propertyTree.beginningLineNumber;
             beginningLineNumber = beginningLineNumber + diff;
+            sortPropertiesCaseSensitive(propertyTree.childrenProperties);
             queue.push(new SortingRange(beginningLineNumber, propertyTree.childrenProperties));
         }
         else if (propertyTree.type === propertyTree_1.Container.Array) {

package/lib/umd/utils/strings.js

@@ -13,7 +13,12 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.stringLength = exports.extendedRegExp = exports.repeat = exports.convertSimple2RegExpPattern = exports.endsWith = exports.startsWith = void 0;
+    exports.startsWith = startsWith;
+    exports.endsWith = endsWith;
+    exports.convertSimple2RegExpPattern = convertSimple2RegExpPattern;
+    exports.repeat = repeat;
+    exports.extendedRegExp = extendedRegExp;
+    exports.stringLength = stringLength;
     function startsWith(haystack, needle) {
         if (haystack.length < needle.length) {
             return false;
@@ -25,7 +30,6 @@
         }
         return true;
     }
-    exports.startsWith = startsWith;
     /**
      * Determines if haystack ends with needle.
      */
@@ -41,11 +45,9 @@
             return false;
         }
     }
-    exports.endsWith = endsWith;
     function convertSimple2RegExpPattern(pattern) {
         return pattern.replace(/[\-\\\{\}\+\?\|\^\$\.\,\[\]\(\)\#\s]/g, '\\$&').replace(/[\*]/g, '.*');
     }
-    exports.convertSimple2RegExpPattern = convertSimple2RegExpPattern;
     function repeat(value, count) {
         let s = '';
         while (count > 0) {
@@ -57,7 +59,6 @@
         }
         return s;
     }
-    exports.repeat = repeat;
     function extendedRegExp(pattern) {
         let flags = '';
         if (startsWith(pattern, '(?i)')) {
@@ -78,7 +79,6 @@
             }
         }
     }
-    exports.extendedRegExp = extendedRegExp;
     // from https://tanishiking.github.io/posts/count-unicode-codepoint/#work-hard-with-for-statements
     function stringLength(str) {
         let count = 0;
@@ -94,5 +94,4 @@
         }
         return count;
     }
-    exports.stringLength = stringLength;
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.3.11",
+  "version": "5.4.1",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -15,19 +15,19 @@
     "url": "https://github.com/Microsoft/vscode-json-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.6",
-    "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
-    "eslint": "^8.57.0",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "18.x",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+  "eslint": "^8.57.0",
     "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876",
-    "mocha": "^10.4.0",
-    "rimraf": "^5.0.5",
-    "typescript": "^5.4.5"
+    "mocha": "^10.7.3",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.5.4"
   },
   "dependencies": {
-    "jsonc-parser": "^3.2.1",
-    "vscode-languageserver-textdocument": "^1.0.11",
+    "jsonc-parser": "^3.3.1",
+    "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-languageserver-types": "^3.17.5",
     "vscode-uri": "^3.0.8",
     "@vscode/l10n": "^0.0.18"