vscode-json-languageservice 3.1.7 → 3.2.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+3.2.0 / 2018-09-27
+==================
+ * New API `LanguageServiceParams.ClientCapabilities` to define what LSP capabilities the client supports.
+ * For the best experiences, clients should always use `LanguageServiceParams.ClientCapabilities.LATEST`, which has all the latest LSP cpabilities enabled.
+ * `LanguageServiceParams.ClientCapabilities` can allow `MarkupKind.Markdown` as valid documentationFormat (used by completions if schemas use `markdownDescription` or `markdownEnumDescriptions`).
+ * snippets can now provide the description also in markdown format.
+ * Bundled draft-07-schema with descriptions.
+ * Propose `examples` in code completions.
+
 3.1.5 / 2018-08-14
 ==================
  * support for JSON schema draft-07

package/README.md

@@ -4,6 +4,7 @@ JSON language service extracted from VSCode to be reused, e.g in the Monaco edit
 [![npm Package](https://img.shields.io/npm/v/vscode-json-languageservice.svg?style=flat-square)](https://www.npmjs.org/package/vscode-json-languageservice)
 [![NPM Downloads](https://img.shields.io/npm/dm/vscode-json-languageservice.svg)](https://npmjs.org/package/vscode-json-languageservice)
 [![Build Status](https://travis-ci.org/Microsoft/vscode-json-languageservice.svg?branch=master)](https://travis-ci.org/Microsoft/vscode-json-languageservice)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Why?
 ----

package/lib/esm/jsonLanguageService.js

@@ -19,7 +19,7 @@ export function getLanguageService(params) {
     var promise = params.promiseConstructor || Promise;
     var jsonSchemaService = new JSONSchemaService(params.schemaRequestService, params.workspaceContext, promise);
     jsonSchemaService.setSchemaContributions(schemaContributions);
-    var jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise);
+    var jsonCompletion = new JSONCompletion(jsonSchemaService, params.contributions, promise, params.clientCapabilities);
     var jsonHover = new JSONHover(jsonSchemaService, params.contributions, promise);
     var jsonDocumentSymbols = new JSONDocumentSymbols(jsonSchemaService);
     var jsonValidation = new JSONValidation(jsonSchemaService, promise);

package/lib/esm/jsonLanguageTypes.d.ts

@@ -1,6 +1,6 @@
 import { JSONWorkerContribution, JSONPath, Segment, CompletionsCollector } from './jsonContributions';
 import { JSONSchema } from './jsonSchema';
-import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
+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 };
 /**
  * Error codes used by diagnostics
@@ -175,4 +175,47 @@ export interface LanguageServiceParams {
      * A promise constructor. If not set, the ES5 Promise will be used.
      */
     promiseConstructor?: PromiseConstructor;
+    /**
+     * Describes the LSP capabilities the client supports.
+     */
+    clientCapabilities?: ClientCapabilities;
+}
+/**
+ * Describes what LSP capabilities the client supports
+ */
+export interface ClientCapabilities {
+    /**
+     * The text document client capabilities
+     */
+    textDocument?: {
+        /**
+         * Capabilities specific to completions.
+         */
+        completion?: {
+            /**
+             * The client supports the following `CompletionItem` specific
+             * capabilities.
+             */
+            completionItem?: {
+                /**
+                 * Client supports the follow content formats for the documentation
+                 * property. The order describes the preferred format of the client.
+                 */
+                documentationFormat?: MarkupKind[];
+            };
+        };
+        /**
+         * Capabilities specific to hovers.
+         */
+        hover?: {
+            /**
+             * Client supports the follow content formats for the content
+             * property. The order describes the preferred format of the client.
+             */
+            contentFormat?: MarkupKind[];
+        };
+    };
+}
+export declare namespace ClientCapabilities {
+    const LATEST: ClientCapabilities;
 }

package/lib/esm/jsonLanguageTypes.js

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 'use strict';
-import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
+import { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind, MarkupKind } from 'vscode-languageserver-types';
 export { Range, TextEdit, Color, ColorInformation, ColorPresentation, FoldingRange, FoldingRangeKind };
 /**
  * Error codes used by diagnostics
@@ -29,4 +29,16 @@ export var ErrorCode;
     ErrorCode[ErrorCode["CommentNotPermitted"] = 521] = "CommentNotPermitted";
     ErrorCode[ErrorCode["SchemaResolveError"] = 768] = "SchemaResolveError";
 })(ErrorCode || (ErrorCode = {}));
+export var ClientCapabilities;
+(function (ClientCapabilities) {
+    ClientCapabilities.LATEST = {
+        textDocument: {
+            completion: {
+                completionItem: {
+                    documentationFormat: [MarkupKind.Markdown, MarkupKind.PlainText]
+                }
+            }
+        }
+    };
+})(ClientCapabilities || (ClientCapabilities = {}));
 //# sourceMappingURL=jsonLanguageTypes.js.map

package/lib/esm/jsonSchema.d.ts

@@ -42,6 +42,7 @@ export interface JSONSchema {
     const?: any;
     contains?: JSONSchemaRef;
     propertyNames?: JSONSchemaRef;
+    examples?: any[];
     $comment?: string;
     if?: JSONSchemaRef;
     then?: JSONSchemaRef;
@@ -49,6 +50,7 @@ export interface JSONSchema {
     defaultSnippets?: {
         label?: string;
         description?: string;
+        markdownDescription?: string;
         body?: any;
         bodyText?: string;
     }[];

package/lib/esm/parser/jsonParser.js

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import * as Json from 'jsonc-parser';
-import * as objects from '../utils/objects';
+import { isNumber, equals, isBoolean, isString, isDefined } from '../utils/objects';
 import { ErrorCode } from '../jsonLanguageTypes';
 import * as nls from 'vscode-nls';
 import Uri from 'vscode-uri';
@@ -144,7 +144,7 @@ var ObjectASTNodeImpl = /** @class */ (function (_super) {
 }(ASTNodeImpl));
 export { ObjectASTNodeImpl };
 export function asSchema(schema) {
-    if (typeof schema === 'boolean') {
+    if (isBoolean(schema)) {
         return schema ? {} : { "not": {} };
     }
     return schema;
@@ -205,10 +205,10 @@ var ValidationResult = /** @class */ (function () {
         return !!this.problems.length;
     };
     ValidationResult.prototype.mergeAll = function (validationResults) {
-        var _this = this;
-        validationResults.forEach(function (validationResult) {
-            _this.merge(validationResult);
-        });
+        for (var _i = 0, validationResults_1 = validationResults; _i < validationResults_1.length; _i++) {
+            var validationResult = validationResults_1[_i];
+            this.merge(validationResult);
+        }
     };
     ValidationResult.prototype.merge = function (validationResult) {
         this.problems = this.problems.concat(validationResult.problems);
@@ -365,9 +365,10 @@ function validate(node, schema, validationResult, matchingSchemas) {
             }
         }
         if (Array.isArray(schema.allOf)) {
-            schema.allOf.forEach(function (subSchemaRef) {
+            for (var _i = 0, _a = schema.allOf; _i < _a.length; _i++) {
+                var subSchemaRef = _a[_i];
                 validate(node, asSchema(subSchemaRef), validationResult, matchingSchemas);
-            });
+            }
         }
         var notSchema = asSchema(schema.not);
         if (notSchema) {
@@ -381,16 +382,18 @@ function validate(node, schema, validationResult, matchingSchemas) {
                     message: localize('notSchemaWarning', "Matches a schema that is not allowed.")
                 });
             }
-            subMatchingSchemas.schemas.forEach(function (ms) {
+            for (var _b = 0, _c = subMatchingSchemas.schemas; _b < _c.length; _b++) {
+                var ms = _c[_b];
                 ms.inverted = !ms.inverted;
                 matchingSchemas.add(ms);
-            });
+            }
         }
         var testAlternatives = function (alternatives, maxOneMatch) {
             var matches = [];
             // remember the best match that is used for error messages
             var bestMatch = null;
-            alternatives.forEach(function (subSchemaRef) {
+            for (var _i = 0, alternatives_1 = alternatives; _i < alternatives_1.length; _i++) {
+                var subSchemaRef = alternatives_1[_i];
                 var subSchema = asSchema(subSchemaRef);
                 var subValidationResult = new ValidationResult();
                 var subMatchingSchemas = matchingSchemas.newSub();
@@ -421,7 +424,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
                         }
                     }
                 }
-            });
+            }
             if (matches.length > 1 && maxOneMatch) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: 1 },
@@ -444,10 +447,9 @@ function validate(node, schema, validationResult, matchingSchemas) {
             testAlternatives(schema.oneOf, true);
         }
         var testBranch = function (schema) {
-            var subSchema = asSchema(schema);
             var subValidationResult = new ValidationResult();
             var subMatchingSchemas = matchingSchemas.newSub();
-            validate(node, subSchema, subValidationResult, subMatchingSchemas);
+            validate(node, asSchema(schema), subValidationResult, subMatchingSchemas);
             validationResult.merge(subValidationResult);
             validationResult.propertiesMatches += subValidationResult.propertiesMatches;
             validationResult.propertiesValueMatches += subValidationResult.propertiesValueMatches;
@@ -458,6 +460,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
             var subValidationResult = new ValidationResult();
             var subMatchingSchemas = matchingSchemas.newSub();
             validate(node, subSchema, subValidationResult, subMatchingSchemas);
+            matchingSchemas.merge(subMatchingSchemas);
             if (!subValidationResult.hasProblems()) {
                 if (thenSchema) {
                     testBranch(thenSchema);
@@ -467,15 +470,16 @@ function validate(node, schema, validationResult, matchingSchemas) {
                 testBranch(elseSchema);
             }
         };
-        if (schema.if) {
-            testCondition(schema.if, schema.then, schema.else);
+        var ifSchema = asSchema(schema.if);
+        if (ifSchema) {
+            testCondition(ifSchema, asSchema(schema.then), asSchema(schema.else));
         }
         if (Array.isArray(schema.enum)) {
             var val = getNodeValue(node);
             var enumValueMatch = false;
-            for (var _i = 0, _a = schema.enum; _i < _a.length; _i++) {
-                var e = _a[_i];
-                if (objects.equals(val, e)) {
+            for (var _d = 0, _e = schema.enum; _d < _e.length; _d++) {
+                var e = _e[_d];
+                if (equals(val, e)) {
                     enumValueMatch = true;
                     break;
                 }
@@ -491,9 +495,9 @@ function validate(node, schema, validationResult, matchingSchemas) {
                 });
             }
         }
-        if (schema.const) {
+        if (isDefined(schema.const)) {
             var val = getNodeValue(node);
-            if (!objects.equals(val, schema.const)) {
+            if (!equals(val, schema.const)) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
                     severity: DiagnosticSeverity.Warning,
@@ -517,7 +521,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
     }
     function _validateNumberNode(node, schema, validationResult, matchingSchemas) {
         var val = node.value;
-        if (typeof schema.multipleOf === 'number') {
+        if (isNumber(schema.multipleOf)) {
             if (val % schema.multipleOf !== 0) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
@@ -527,22 +531,22 @@ function validate(node, schema, validationResult, matchingSchemas) {
             }
         }
         function getExclusiveLimit(limit, exclusive) {
-            if (typeof exclusive === 'number') {
+            if (isNumber(exclusive)) {
                 return exclusive;
             }
-            if (typeof exclusive === 'boolean' && exclusive) {
+            if (isBoolean(exclusive) && exclusive) {
                 return limit;
             }
             return void 0;
         }
         function getLimit(limit, exclusive) {
-            if (typeof exclusive !== 'boolean' || !exclusive) {
+            if (!isBoolean(exclusive) || !exclusive) {
                 return limit;
             }
             return void 0;
         }
         var exclusiveMinimum = getExclusiveLimit(schema.minimum, schema.exclusiveMinimum);
-        if (typeof exclusiveMinimum === 'number' && val <= exclusiveMinimum) {
+        if (isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
@@ -550,7 +554,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
             });
         }
         var exclusiveMaximum = getExclusiveLimit(schema.maximum, schema.exclusiveMaximum);
-        if (typeof exclusiveMaximum === 'number' && val >= exclusiveMaximum) {
+        if (isNumber(exclusiveMaximum) && val >= exclusiveMaximum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
@@ -558,7 +562,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
             });
         }
         var minimum = getLimit(schema.minimum, schema.exclusiveMinimum);
-        if (typeof minimum === 'number' && val < minimum) {
+        if (isNumber(minimum) && val < minimum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
@@ -566,7 +570,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
             });
         }
         var maximum = getLimit(schema.maximum, schema.exclusiveMaximum);
-        if (typeof maximum === 'number' && val > maximum) {
+        if (isNumber(maximum) && val > maximum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
@@ -575,21 +579,21 @@ function validate(node, schema, validationResult, matchingSchemas) {
         }
     }
     function _validateStringNode(node, schema, validationResult, matchingSchemas) {
-        if (schema.minLength && node.value.length < schema.minLength) {
+        if (isNumber(schema.minLength) && node.value.length < schema.minLength) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
                 message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
             });
         }
-        if (schema.maxLength && node.value.length > schema.maxLength) {
+        if (isNumber(schema.maxLength) && node.value.length > schema.maxLength) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
                 message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
             });
         }
-        if (schema.pattern) {
+        if (isString(schema.pattern)) {
             var regex = new RegExp(schema.pattern);
             if (!regex.test(node.value)) {
                 validationResult.problems.push({
@@ -656,8 +660,9 @@ function validate(node, schema, validationResult, matchingSchemas) {
     }
     function _validateArrayNode(node, schema, validationResult, matchingSchemas) {
         if (Array.isArray(schema.items)) {
-            var subSchemas_1 = schema.items;
-            subSchemas_1.forEach(function (subSchemaRef, index) {
+            var subSchemas = schema.items;
+            for (var index = 0; index < subSchemas.length; index++) {
+                var subSchemaRef = subSchemas[index];
                 var subSchema = asSchema(subSchemaRef);
                 var itemValidationResult = new ValidationResult();
                 var item = node.items[index];
@@ -665,13 +670,13 @@ function validate(node, schema, validationResult, matchingSchemas) {
                     validate(item, subSchema, itemValidationResult, matchingSchemas);
                     validationResult.mergePropertyMatch(itemValidationResult);
                 }
-                else if (node.items.length >= subSchemas_1.length) {
+                else if (node.items.length >= subSchemas.length) {
                     validationResult.propertiesValueMatches++;
                 }
-            });
-            if (node.items.length > subSchemas_1.length) {
+            }
+            if (node.items.length > subSchemas.length) {
                 if (typeof schema.additionalItems === 'object') {
-                    for (var i = subSchemas_1.length; i < node.items.length; i++) {
+                    for (var i = subSchemas.length; i < node.items.length; i++) {
                         var itemValidationResult = new ValidationResult();
                         validate(node.items[i], schema.additionalItems, itemValidationResult, matchingSchemas);
                         validationResult.mergePropertyMatch(itemValidationResult);
@@ -681,19 +686,20 @@ function validate(node, schema, validationResult, matchingSchemas) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
                         severity: DiagnosticSeverity.Warning,
-                        message: localize('additionalItemsWarning', 'Array has too many items according to schema. Expected {0} or fewer.', subSchemas_1.length)
+                        message: localize('additionalItemsWarning', 'Array has too many items according to schema. Expected {0} or fewer.', subSchemas.length)
                     });
                 }
             }
         }
         else {
-            var itemSchema_1 = asSchema(schema.items);
-            if (itemSchema_1) {
-                node.items.forEach(function (item) {
+            var itemSchema = asSchema(schema.items);
+            if (itemSchema) {
+                for (var _i = 0, _a = node.items; _i < _a.length; _i++) {
+                    var item = _a[_i];
                     var itemValidationResult = new ValidationResult();
-                    validate(item, itemSchema_1, itemValidationResult, matchingSchemas);
+                    validate(item, itemSchema, itemValidationResult, matchingSchemas);
                     validationResult.mergePropertyMatch(itemValidationResult);
-                });
+                }
             }
         }
         var containsSchema = asSchema(schema.contains);
@@ -711,14 +717,14 @@ function validate(node, schema, validationResult, matchingSchemas) {
                 });
             }
         }
-        if (schema.minItems && node.items.length < schema.minItems) {
+        if (isNumber(schema.minItems) && node.items.length < schema.minItems) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
                 message: localize('minItemsWarning', 'Array has too few items. Expected {0} or more.', schema.minItems)
             });
         }
-        if (schema.maxItems && node.items.length > schema.maxItems) {
+        if (isNumber(schema.maxItems) && node.items.length > schema.maxItems) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
                 severity: DiagnosticSeverity.Warning,
@@ -742,13 +748,15 @@ function validate(node, schema, validationResult, matchingSchemas) {
     function _validateObjectNode(node, schema, validationResult, matchingSchemas) {
         var seenKeys = Object.create(null);
         var unprocessedProperties = [];
-        node.properties.forEach(function (node) {
-            var key = node.keyNode.value;
-            seenKeys[key] = node.valueNode;
+        for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+            var propertyNode = _a[_i];
+            var key = propertyNode.keyNode.value;
+            seenKeys[key] = propertyNode.valueNode;
             unprocessedProperties.push(key);
-        });
+        }
         if (Array.isArray(schema.required)) {
-            schema.required.forEach(function (propertyName) {
+            for (var _b = 0, _c = schema.required; _b < _c.length; _b++) {
+                var propertyName = _c[_b];
                 if (!seenKeys[propertyName]) {
                     var keyNode = node.parent && node.parent.type === 'property' && node.parent.keyNode;
                     var location = keyNode ? { offset: keyNode.offset, length: keyNode.length } : { offset: node.offset, length: 1 };
@@ -758,7 +766,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
                         message: localize('MissingRequiredPropWarning', 'Missing property "{0}".', propertyName)
                     });
                 }
-            });
+            }
         }
         var propertyProcessed = function (prop) {
             var index = unprocessedProperties.indexOf(prop);
@@ -768,12 +776,13 @@ function validate(node, schema, validationResult, matchingSchemas) {
             }
         };
         if (schema.properties) {
-            Object.keys(schema.properties).forEach(function (propertyName) {
+            for (var _d = 0, _e = Object.keys(schema.properties); _d < _e.length; _d++) {
+                var propertyName = _e[_d];
                 propertyProcessed(propertyName);
                 var propertySchema = schema.properties[propertyName];
                 var child = seenKeys[propertyName];
                 if (child) {
-                    if (typeof propertySchema === 'boolean') {
+                    if (isBoolean(propertySchema)) {
                         if (!propertySchema) {
                             var propertyNode = child.parent;
                             validationResult.problems.push({
@@ -793,18 +802,20 @@ function validate(node, schema, validationResult, matchingSchemas) {
                         validationResult.mergePropertyMatch(propertyValidationResult);
                     }
                 }
-            });
+            }
         }
         if (schema.patternProperties) {
-            Object.keys(schema.patternProperties).forEach(function (propertyPattern) {
+            for (var _f = 0, _g = Object.keys(schema.patternProperties); _f < _g.length; _f++) {
+                var propertyPattern = _g[_f];
                 var regex = new RegExp(propertyPattern);
-                unprocessedProperties.slice(0).forEach(function (propertyName) {
+                for (var _h = 0, _j = unprocessedProperties.slice(0); _h < _j.length; _h++) {
+                    var propertyName = _j[_h];
                     if (regex.test(propertyName)) {
                         propertyProcessed(propertyName);
                         var child = seenKeys[propertyName];
                         if (child) {
                             var propertySchema = schema.patternProperties[propertyPattern];
-                            if (typeof propertySchema === 'boolean') {
+                            if (isBoolean(propertySchema)) {
                                 if (!propertySchema) {
                                     var propertyNode = child.parent;
                                     validationResult.problems.push({
@@ -825,22 +836,24 @@ function validate(node, schema, validationResult, matchingSchemas) {
                             }
                         }
                     }
-                });
-            });
+                }
+            }
         }
         if (typeof schema.additionalProperties === 'object') {
-            unprocessedProperties.forEach(function (propertyName) {
+            for (var _k = 0, unprocessedProperties_1 = unprocessedProperties; _k < unprocessedProperties_1.length; _k++) {
+                var propertyName = unprocessedProperties_1[_k];
                 var child = seenKeys[propertyName];
                 if (child) {
                     var propertyValidationResult = new ValidationResult();
                     validate(child, schema.additionalProperties, propertyValidationResult, matchingSchemas);
                     validationResult.mergePropertyMatch(propertyValidationResult);
                 }
-            });
+            }
         }
         else if (schema.additionalProperties === false) {
             if (unprocessedProperties.length > 0) {
-                unprocessedProperties.forEach(function (propertyName) {
+                for (var _l = 0, unprocessedProperties_2 = unprocessedProperties; _l < unprocessedProperties_2.length; _l++) {
+                    var propertyName = unprocessedProperties_2[_l];
                     var child = seenKeys[propertyName];
                     if (child) {
                         var propertyNode = child.parent;
@@ -850,10 +863,10 @@ function validate(node, schema, validationResult, matchingSchemas) {
                             message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                         });
                     }
-                });
+                }
             }
         }
-        if (schema.maxProperties) {
+        if (isNumber(schema.maxProperties)) {
             if (node.properties.length > schema.maxProperties) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
@@ -862,7 +875,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
                 });
             }
         }
-        if (schema.minProperties) {
+        if (isNumber(schema.minProperties)) {
             if (node.properties.length < schema.minProperties) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
@@ -872,12 +885,14 @@ function validate(node, schema, validationResult, matchingSchemas) {
             }
         }
         if (schema.dependencies) {
-            Object.keys(schema.dependencies).forEach(function (key) {
+            for (var _m = 0, _o = Object.keys(schema.dependencies); _m < _o.length; _m++) {
+                var key = _o[_m];
                 var prop = seenKeys[key];
                 if (prop) {
                     var propertyDep = schema.dependencies[key];
                     if (Array.isArray(propertyDep)) {
-                        propertyDep.forEach(function (requiredProp) {
+                        for (var _p = 0, propertyDep_1 = propertyDep; _p < propertyDep_1.length; _p++) {
+                            var requiredProp = propertyDep_1[_p];
                             if (!seenKeys[requiredProp]) {
                                 validationResult.problems.push({
                                     location: { offset: node.offset, length: node.length },
@@ -888,7 +903,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
                             else {
                                 validationResult.propertiesValueMatches++;
                             }
-                        });
+                        }
                     }
                     else {
                         var propertySchema = asSchema(propertyDep);
@@ -899,16 +914,17 @@ function validate(node, schema, validationResult, matchingSchemas) {
                         }
                     }
                 }
-            });
+            }
         }
         var propertyNames = asSchema(schema.propertyNames);
         if (propertyNames) {
-            node.properties.forEach(function (f) {
+            for (var _q = 0, _r = node.properties; _q < _r.length; _q++) {
+                var f = _r[_q];
                 var key = f.keyNode;
                 if (key) {
                     validate(key, propertyNames, validationResult, NoOpSchemaCollector.instance);
                 }
-            });
+            }
         }
     }
 }
@@ -1156,7 +1172,7 @@ export function parse(textDocument, config) {
             var tokenValue = scanner.getTokenValue();
             try {
                 var numberValue = JSON.parse(tokenValue);
-                if (typeof numberValue !== 'number') {
+                if (!isNumber(numberValue)) {
                     return _error(localize('InvalidNumberFormat', 'Invalid number format.'), ErrorCode.Undefined, node);
                 }
                 node.value = numberValue;