vscode-json-languageservice 3.3.0-next.7 → 3.3.3

package/CHANGELOG.md

@@ -1,4 +1,8 @@
-NEXT
+3.3.3 / 2019-0829
+=================
+Schemas can configure wheter comments and/or trailing are permitted.
+
+3.3.0 / 2019-06-12
 ==================
 * New API `LanguageService.getSelectionRanges` to get semantic selection ranges.
 * Manage schema dependencies so that `resetSchema` also resets schemas that depend on the schema.

package/lib/esm/jsonLanguageService.d.ts

@@ -22,6 +22,6 @@ export interface LanguageService {
     getFoldingRanges(document: TextDocument, context?: {
         rangeLimit?: number;
     }): FoldingRange[];
-    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[][];
+    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/esm/jsonLanguageTypes.d.ts

@@ -1,40 +1,7 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
-import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind } from 'vscode-languageserver-types';
-export { Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind };
-/**
- * Enum of known selection range kinds
- */
-export declare enum SelectionRangeKind {
-    /**
-     * Empty Kind.
-     */
-    Empty = "",
-    /**
-     * The statment kind, its value is `statement`, possible extensions can be
-     * `statement.if` etc
-     */
-    Statement = "statement",
-    /**
-     * The declaration kind, its value is `declaration`, possible extensions can be
-     * `declaration.function`, `declaration.class` etc.
-     */
-    Declaration = "declaration"
-}
-/**
- * Represents a selection range
- */
-export interface SelectionRange {
-    /**
-     * Range of the selection.
-     */
-    range: Range;
-    /**
-     * Describes the kind of the selection range such as `statemet' or 'declaration'. See
-     * [SelectionRangeKind](#SelectionRangeKind) for an enumeration of standardized kinds.
-     */
-    kind: string;
-}
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange } from 'vscode-languageserver-types';
+export { Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange };
 /**
  * Error codes used by diagnostics
  */

package/lib/esm/jsonLanguageTypes.js

@@ -1,27 +1,5 @@
-import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind } from 'vscode-languageserver-types';
-export { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind };
-// #region Proposed types, remove once added to vscode-languageserver-types
-/**
- * Enum of known selection range kinds
- */
-export var SelectionRangeKind;
-(function (SelectionRangeKind) {
-    /**
-     * Empty Kind.
-     */
-    SelectionRangeKind["Empty"] = "";
-    /**
-     * The statment kind, its value is `statement`, possible extensions can be
-     * `statement.if` etc
-     */
-    SelectionRangeKind["Statement"] = "statement";
-    /**
-     * The declaration kind, its value is `declaration`, possible extensions can be
-     * `declaration.function`, `declaration.class` etc.
-     */
-    SelectionRangeKind["Declaration"] = "declaration";
-})(SelectionRangeKind || (SelectionRangeKind = {}));
-// #endregion
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange } from 'vscode-languageserver-types';
+export { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange };
 /**
  * Error codes used by diagnostics
  */

package/lib/esm/jsonSchema.d.ts

@@ -62,6 +62,7 @@ export interface JSONSchema {
     markdownDescription?: string;
     doNotSuggest?: boolean;
     allowComments?: boolean;
+    allowsTrailingCommas?: boolean;
 }
 export interface JSONSchemaMap {
     [name: string]: JSONSchemaRef;

package/lib/esm/parser/jsonParser.js

@@ -19,11 +19,15 @@ import * as Json from 'jsonc-parser';
 import { isNumber, equals, isBoolean, isString, isDefined } from '../utils/objects';
 import { ErrorCode } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
-import Uri from 'vscode-uri';
 import { Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver-types';
 var localize = nls.loadMessageBundle();
-var colorHexPattern = /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/;
-var emailPattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+var formats = {
+    'color-hex': { errorMessage: localize('colorHexFormatWarning', 'Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.'), pattern: /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/ },
+    'date-time': { errorMessage: localize('dateTimeFormatWarning', 'String is not a RFC3339 date-time.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
+    'date': { errorMessage: localize('dateFormatWarning', 'String is not a RFC3339 date.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/i },
+    'time': { errorMessage: localize('timeFormatWarning', 'String is not a RFC3339 time.'), pattern: /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
+    'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ }
+};
 var ASTNodeImpl = /** @class */ (function () {
     function ASTNodeImpl(parent, offset, length) {
         this.offset = offset;
@@ -612,14 +616,12 @@ function validate(node, schema, validationResult, matchingSchemas) {
                             errorMessage = localize('uriEmpty', 'URI expected.');
                         }
                         else {
-                            try {
-                                var uri = Uri.parse(node.value);
-                                if (!uri.scheme && schema.format === 'uri') {
-                                    errorMessage = localize('uriSchemeMissing', 'URI with a scheme is expected.');
-                                }
+                            var match = /^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/.exec(node.value);
+                            if (!match) {
+                                errorMessage = localize('uriMissing', 'URI is expected.');
                             }
-                            catch (e) {
-                                errorMessage = e.message;
+                            else if (!match[2] && schema.format === 'uri') {
+                                errorMessage = localize('uriSchemeMissing', 'URI with a scheme is expected.');
                             }
                         }
                         if (errorMessage) {
@@ -631,28 +633,19 @@ function validate(node, schema, validationResult, matchingSchemas) {
                         }
                     }
                     break;
-                case 'email':
-                    {
-                        if (!node.value.match(emailPattern)) {
-                            validationResult.problems.push({
-                                location: { offset: node.offset, length: node.length },
-                                severity: DiagnosticSeverity.Warning,
-                                message: schema.patternErrorMessage || schema.errorMessage || localize('emailFormatWarning', 'String is not an e-mail address.')
-                            });
-                        }
-                    }
-                    break;
                 case 'color-hex':
-                    {
-                        if (!node.value.match(colorHexPattern)) {
-                            validationResult.problems.push({
-                                location: { offset: node.offset, length: node.length },
-                                severity: DiagnosticSeverity.Warning,
-                                message: schema.patternErrorMessage || schema.errorMessage || localize('colorHexFormatWarning', 'Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.')
-                            });
-                        }
+                case 'date-time':
+                case 'date':
+                case 'time':
+                case 'email':
+                    var format = formats[schema.format];
+                    if (!node.value || !format.pattern.exec(node.value)) {
+                        validationResult.problems.push({
+                            location: { offset: node.offset, length: node.length },
+                            severity: DiagnosticSeverity.Warning,
+                            message: schema.patternErrorMessage || schema.errorMessage || format.errorMessage
+                        });
                     }
-                    break;
                 default:
             }
         }

package/lib/esm/services/jsonSchemaService.js

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as Json from 'jsonc-parser';
-import URI from 'vscode-uri';
+import { URI } from 'vscode-uri';
 import * as Strings from '../utils/strings';
 import * as Parser from '../parser/jsonParser';
 import * as nls from 'vscode-nls';
@@ -170,7 +170,12 @@ var JSONSchemaService = /** @class */ (function () {
     };
     JSONSchemaService.prototype.normalizeId = function (id) {
         // remove trailing '#', normalize drive capitalization
-        return URI.parse(id).toString();
+        try {
+            return URI.parse(id).toString();
+        }
+        catch (e) {
+            return id;
+        }
     };
     JSONSchemaService.prototype.setSchemaContributions = function (schemaContributions) {
         if (schemaContributions.schemas) {

package/lib/esm/services/jsonSelectionRanges.js

@@ -2,16 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Range } from 'vscode-languageserver-types';
+import { Range, SelectionRange } from 'vscode-languageserver-types';
 import { createScanner } from 'jsonc-parser';
-import { SelectionRangeKind } from '../jsonLanguageTypes';
 export function getSelectionRanges(document, positions, doc) {
     function getSelectionRange(position) {
         var offset = document.offsetAt(position);
         var node = doc.getNodeFromOffset(offset, true);
-        if (!node) {
-            return [];
-        }
         var result = [];
         while (node) {
             switch (node.type) {
@@ -40,13 +36,17 @@ export function getSelectionRanges(document, positions, doc) {
             }
             node = node.parent;
         }
-        return result;
+        var current = undefined;
+        for (var index = result.length - 1; index >= 0; index--) {
+            current = SelectionRange.create(result[index], current);
+        }
+        if (!current) {
+            current = SelectionRange.create(Range.create(position, position));
+        }
+        return current;
     }
     function newRange(start, end) {
-        return {
-            range: Range.create(document.positionAt(start), document.positionAt(end)),
-            kind: SelectionRangeKind.Declaration
-        };
+        return Range.create(document.positionAt(start), document.positionAt(end));
     }
     var scanner = createScanner(document.getText(), true);
     function getOffsetAfterNextToken(offset, expectedToken) {

package/lib/esm/services/jsonValidation.js

@@ -6,6 +6,7 @@ import { UnresolvedSchema } from './jsonSchemaService';
 import { Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver-types';
 import { ErrorCode } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
+import { isBoolean } from '../utils/objects';
 var localize = nls.loadMessageBundle();
 var JSONValidation = /** @class */ (function () {
     function JSONValidation(jsonSchemaService, promiseConstructor) {
@@ -58,7 +59,10 @@ var JSONValidation = /** @class */ (function () {
                     }
                 }
                 if (schemaAllowsComments(schema.schema)) {
-                    trailingCommaSeverity = commentSeverity = void 0;
+                    commentSeverity = void 0;
+                }
+                if (schemaAllowsTrailingCommas(schema.schema)) {
+                    trailingCommaSeverity = void 0;
                 }
             }
             for (var _i = 0, _a = jsonDocument.syntaxErrors; _i < _a.length; _i++) {
@@ -95,14 +99,37 @@ export { JSONValidation };
 var idCounter = 0;
 function schemaAllowsComments(schemaRef) {
     if (schemaRef && typeof schemaRef === 'object') {
-        if (schemaRef.allowComments) {
-            return true;
+        if (isBoolean(schemaRef.allowComments)) {
+            return schemaRef.allowComments;
         }
         if (schemaRef.allOf) {
-            return schemaRef.allOf.some(schemaAllowsComments);
+            for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
+                var schema = _a[_i];
+                var allow = schemaAllowsComments(schema);
+                if (isBoolean(allow)) {
+                    return allow;
+                }
+            }
+        }
+    }
+    return undefined;
+}
+function schemaAllowsTrailingCommas(schemaRef) {
+    if (schemaRef && typeof schemaRef === 'object') {
+        if (isBoolean(schemaRef.allowsTrailingCommas)) {
+            return schemaRef.allowsTrailingCommas;
+        }
+        if (schemaRef.allOf) {
+            for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
+                var schema = _a[_i];
+                var allow = schemaAllowsTrailingCommas(schema);
+                if (isBoolean(allow)) {
+                    return allow;
+                }
+            }
         }
     }
-    return false;
+    return undefined;
 }
 function toDiagnosticSeverity(severityLevel) {
     switch (severityLevel) {

package/lib/umd/jsonLanguageService.d.ts

@@ -22,6 +22,6 @@ export interface LanguageService {
     getFoldingRanges(document: TextDocument, context?: {
         rangeLimit?: number;
     }): FoldingRange[];
-    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[][];
+    getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/umd/jsonLanguageTypes.d.ts

@@ -1,40 +1,7 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
-import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind } from 'vscode-languageserver-types';
-export { Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind };
-/**
- * Enum of known selection range kinds
- */
-export declare enum SelectionRangeKind {
-    /**
-     * Empty Kind.
-     */
-    Empty = "",
-    /**
-     * The statment kind, its value is `statement`, possible extensions can be
-     * `statement.if` etc
-     */
-    Statement = "statement",
-    /**
-     * The declaration kind, its value is `declaration`, possible extensions can be
-     * `declaration.function`, `declaration.class` etc.
-     */
-    Declaration = "declaration"
-}
-/**
- * Represents a selection range
- */
-export interface SelectionRange {
-    /**
-     * Range of the selection.
-     */
-    range: Range;
-    /**
-     * Describes the kind of the selection range such as `statemet' or 'declaration'. See
-     * [SelectionRangeKind](#SelectionRangeKind) for an enumeration of standardized kinds.
-     */
-    kind: string;
-}
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind, SelectionRange } from 'vscode-languageserver-types';
+export { Range, TextEdit, JSONSchema, JSONWorkerContribution, JSONPath, Segment, CompletionsCollector, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, SelectionRange };
 /**
  * Error codes used by diagnostics
  */

package/lib/umd/jsonLanguageTypes.js

@@ -17,28 +17,7 @@
     exports.ColorPresentation = vscode_languageserver_types_1.ColorPresentation;
     exports.FoldingRange = vscode_languageserver_types_1.FoldingRange;
     exports.FoldingRangeKind = vscode_languageserver_types_1.FoldingRangeKind;
-    // #region Proposed types, remove once added to vscode-languageserver-types
-    /**
-     * Enum of known selection range kinds
-     */
-    var SelectionRangeKind;
-    (function (SelectionRangeKind) {
-        /**
-         * Empty Kind.
-         */
-        SelectionRangeKind["Empty"] = "";
-        /**
-         * The statment kind, its value is `statement`, possible extensions can be
-         * `statement.if` etc
-         */
-        SelectionRangeKind["Statement"] = "statement";
-        /**
-         * The declaration kind, its value is `declaration`, possible extensions can be
-         * `declaration.function`, `declaration.class` etc.
-         */
-        SelectionRangeKind["Declaration"] = "declaration";
-    })(SelectionRangeKind = exports.SelectionRangeKind || (exports.SelectionRangeKind = {}));
-    // #endregion
+    exports.SelectionRange = vscode_languageserver_types_1.SelectionRange;
     /**
      * Error codes used by diagnostics
      */

package/lib/umd/jsonSchema.d.ts

@@ -62,6 +62,7 @@ export interface JSONSchema {
     markdownDescription?: string;
     doNotSuggest?: boolean;
     allowComments?: boolean;
+    allowsTrailingCommas?: boolean;
 }
 export interface JSONSchemaMap {
     [name: string]: JSONSchemaRef;

package/lib/umd/parser/jsonParser.js

@@ -21,7 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "jsonc-parser", "../utils/objects", "../jsonLanguageTypes", "vscode-nls", "vscode-uri", "vscode-languageserver-types"], factory);
+        define(["require", "exports", "jsonc-parser", "../utils/objects", "../jsonLanguageTypes", "vscode-nls", "vscode-languageserver-types"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -30,11 +30,15 @@ var __extends = (this && this.__extends) || (function () {
     var objects_1 = require("../utils/objects");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var nls = require("vscode-nls");
-    var vscode_uri_1 = require("vscode-uri");
     var vscode_languageserver_types_1 = require("vscode-languageserver-types");
     var localize = nls.loadMessageBundle();
-    var colorHexPattern = /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/;
-    var emailPattern = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    var formats = {
+        'color-hex': { errorMessage: localize('colorHexFormatWarning', 'Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.'), pattern: /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/ },
+        'date-time': { errorMessage: localize('dateTimeFormatWarning', 'String is not a RFC3339 date-time.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
+        'date': { errorMessage: localize('dateFormatWarning', 'String is not a RFC3339 date.'), pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/i },
+        'time': { errorMessage: localize('timeFormatWarning', 'String is not a RFC3339 time.'), pattern: /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i },
+        'email': { errorMessage: localize('emailFormatWarning', 'String is not an e-mail address.'), pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ }
+    };
     var ASTNodeImpl = /** @class */ (function () {
         function ASTNodeImpl(parent, offset, length) {
             this.offset = offset;
@@ -628,14 +632,12 @@ var __extends = (this && this.__extends) || (function () {
                                 errorMessage = localize('uriEmpty', 'URI expected.');
                             }
                             else {
-                                try {
-                                    var uri = vscode_uri_1.default.parse(node.value);
-                                    if (!uri.scheme && schema.format === 'uri') {
-                                        errorMessage = localize('uriSchemeMissing', 'URI with a scheme is expected.');
-                                    }
+                                var match = /^(([^:/?#]+?):)?(\/\/([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?/.exec(node.value);
+                                if (!match) {
+                                    errorMessage = localize('uriMissing', 'URI is expected.');
                                 }
-                                catch (e) {
-                                    errorMessage = e.message;
+                                else if (!match[2] && schema.format === 'uri') {
+                                    errorMessage = localize('uriSchemeMissing', 'URI with a scheme is expected.');
                                 }
                             }
                             if (errorMessage) {
@@ -647,28 +649,19 @@ var __extends = (this && this.__extends) || (function () {
                             }
                         }
                         break;
-                    case 'email':
-                        {
-                            if (!node.value.match(emailPattern)) {
-                                validationResult.problems.push({
-                                    location: { offset: node.offset, length: node.length },
-                                    severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
-                                    message: schema.patternErrorMessage || schema.errorMessage || localize('emailFormatWarning', 'String is not an e-mail address.')
-                                });
-                            }
-                        }
-                        break;
                     case 'color-hex':
-                        {
-                            if (!node.value.match(colorHexPattern)) {
-                                validationResult.problems.push({
-                                    location: { offset: node.offset, length: node.length },
-                                    severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
-                                    message: schema.patternErrorMessage || schema.errorMessage || localize('colorHexFormatWarning', 'Invalid color format. Use #RGB, #RGBA, #RRGGBB or #RRGGBBAA.')
-                                });
-                            }
+                    case 'date-time':
+                    case 'date':
+                    case 'time':
+                    case 'email':
+                        var format = formats[schema.format];
+                        if (!node.value || !format.pattern.exec(node.value)) {
+                            validationResult.problems.push({
+                                location: { offset: node.offset, length: node.length },
+                                severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
+                                message: schema.patternErrorMessage || schema.errorMessage || format.errorMessage
+                            });
                         }
-                        break;
                     default:
                 }
             }

package/lib/umd/services/jsonSchemaService.js

@@ -141,7 +141,7 @@
         }
         JSONSchemaService.prototype.getRegisteredSchemaIds = function (filter) {
             return Object.keys(this.registeredSchemasIds).filter(function (id) {
-                var scheme = vscode_uri_1.default.parse(id).scheme;
+                var scheme = vscode_uri_1.URI.parse(id).scheme;
                 return scheme !== 'schemaservice' && (!filter || filter(scheme));
             });
         };
@@ -181,7 +181,12 @@
         };
         JSONSchemaService.prototype.normalizeId = function (id) {
             // remove trailing '#', normalize drive capitalization
-            return vscode_uri_1.default.parse(id).toString();
+            try {
+                return vscode_uri_1.URI.parse(id).toString();
+            }
+            catch (e) {
+                return id;
+            }
         };
         JSONSchemaService.prototype.setSchemaContributions = function (schemaContributions) {
             if (schemaContributions.schemas) {
@@ -470,7 +475,7 @@
     exports.JSONSchemaService = JSONSchemaService;
     function toDisplayString(url) {
         try {
-            var uri = vscode_uri_1.default.parse(url);
+            var uri = vscode_uri_1.URI.parse(url);
             if (uri.scheme === 'file') {
                 return uri.fsPath;
             }

package/lib/umd/services/jsonSelectionRanges.js

@@ -8,21 +8,17 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "vscode-languageserver-types", "jsonc-parser", "../jsonLanguageTypes"], factory);
+        define(["require", "exports", "vscode-languageserver-types", "jsonc-parser"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var vscode_languageserver_types_1 = require("vscode-languageserver-types");
     var jsonc_parser_1 = require("jsonc-parser");
-    var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     function getSelectionRanges(document, positions, doc) {
         function getSelectionRange(position) {
             var offset = document.offsetAt(position);
             var node = doc.getNodeFromOffset(offset, true);
-            if (!node) {
-                return [];
-            }
             var result = [];
             while (node) {
                 switch (node.type) {
@@ -51,13 +47,17 @@
                 }
                 node = node.parent;
             }
-            return result;
+            var current = undefined;
+            for (var index = result.length - 1; index >= 0; index--) {
+                current = vscode_languageserver_types_1.SelectionRange.create(result[index], current);
+            }
+            if (!current) {
+                current = vscode_languageserver_types_1.SelectionRange.create(vscode_languageserver_types_1.Range.create(position, position));
+            }
+            return current;
         }
         function newRange(start, end) {
-            return {
-                range: vscode_languageserver_types_1.Range.create(document.positionAt(start), document.positionAt(end)),
-                kind: jsonLanguageTypes_1.SelectionRangeKind.Declaration
-            };
+            return vscode_languageserver_types_1.Range.create(document.positionAt(start), document.positionAt(end));
         }
         var scanner = jsonc_parser_1.createScanner(document.getText(), true);
         function getOffsetAfterNextToken(offset, expectedToken) {

package/lib/umd/services/jsonValidation.js

@@ -8,7 +8,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./jsonSchemaService", "vscode-languageserver-types", "../jsonLanguageTypes", "vscode-nls"], factory);
+        define(["require", "exports", "./jsonSchemaService", "vscode-languageserver-types", "../jsonLanguageTypes", "vscode-nls", "../utils/objects"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -17,6 +17,7 @@
     var vscode_languageserver_types_1 = require("vscode-languageserver-types");
     var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
     var nls = require("vscode-nls");
+    var objects_1 = require("../utils/objects");
     var localize = nls.loadMessageBundle();
     var JSONValidation = /** @class */ (function () {
         function JSONValidation(jsonSchemaService, promiseConstructor) {
@@ -69,7 +70,10 @@
                         }
                     }
                     if (schemaAllowsComments(schema.schema)) {
-                        trailingCommaSeverity = commentSeverity = void 0;
+                        commentSeverity = void 0;
+                    }
+                    if (schemaAllowsTrailingCommas(schema.schema)) {
+                        trailingCommaSeverity = void 0;
                     }
                 }
                 for (var _i = 0, _a = jsonDocument.syntaxErrors; _i < _a.length; _i++) {
@@ -106,14 +110,37 @@
     var idCounter = 0;
     function schemaAllowsComments(schemaRef) {
         if (schemaRef && typeof schemaRef === 'object') {
-            if (schemaRef.allowComments) {
-                return true;
+            if (objects_1.isBoolean(schemaRef.allowComments)) {
+                return schemaRef.allowComments;
             }
             if (schemaRef.allOf) {
-                return schemaRef.allOf.some(schemaAllowsComments);
+                for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
+                    var schema = _a[_i];
+                    var allow = schemaAllowsComments(schema);
+                    if (objects_1.isBoolean(allow)) {
+                        return allow;
+                    }
+                }
+            }
+        }
+        return undefined;
+    }
+    function schemaAllowsTrailingCommas(schemaRef) {
+        if (schemaRef && typeof schemaRef === 'object') {
+            if (objects_1.isBoolean(schemaRef.allowsTrailingCommas)) {
+                return schemaRef.allowsTrailingCommas;
+            }
+            if (schemaRef.allOf) {
+                for (var _i = 0, _a = schemaRef.allOf; _i < _a.length; _i++) {
+                    var schema = _a[_i];
+                    var allow = schemaAllowsTrailingCommas(schema);
+                    if (objects_1.isBoolean(allow)) {
+                        return allow;
+                    }
+                }
             }
         }
-        return false;
+        return undefined;
     }
     function toDiagnosticSeverity(severityLevel) {
         switch (severityLevel) {