vscode-json-languageservice 3.4.12 → 3.7.0

package/lib/umd/parser/jsonParser.js

@@ -40,6 +40,7 @@ var __extends = (this && this.__extends) || (function () {
     };
     var ASTNodeImpl = /** @class */ (function () {
         function ASTNodeImpl(parent, offset, length) {
+            if (length === void 0) { length = 0; }
             this.offset = offset;
             this.length = length;
             this.parent = parent;
@@ -122,10 +123,11 @@ var __extends = (this && this.__extends) || (function () {
     exports.StringASTNodeImpl = StringASTNodeImpl;
     var PropertyASTNodeImpl = /** @class */ (function (_super) {
         __extends(PropertyASTNodeImpl, _super);
-        function PropertyASTNodeImpl(parent, offset) {
+        function PropertyASTNodeImpl(parent, offset, keyNode) {
             var _this = _super.call(this, parent, offset) || this;
             _this.type = 'property';
             _this.colonOffset = -1;
+            _this.keyNode = keyNode;
             return _this;
         }
         Object.defineProperty(PropertyASTNodeImpl.prototype, "children", {
@@ -171,7 +173,6 @@ var __extends = (this && this.__extends) || (function () {
     var SchemaCollector = /** @class */ (function () {
         function SchemaCollector(focusOffset, exclude) {
             if (focusOffset === void 0) { focusOffset = -1; }
-            if (exclude === void 0) { exclude = null; }
             this.focusOffset = focusOffset;
             this.exclude = exclude;
             this.schemas = [];
@@ -180,8 +181,7 @@ var __extends = (this && this.__extends) || (function () {
             this.schemas.push(schema);
         };
         SchemaCollector.prototype.merge = function (other) {
-            var _a;
-            (_a = this.schemas).push.apply(_a, other.schemas);
+            Array.prototype.push.apply(this.schemas, other.schemas);
         };
         SchemaCollector.prototype.include = function (node) {
             return (this.focusOffset === -1 || contains(node, this.focusOffset)) && (node !== this.exclude);
@@ -213,7 +213,7 @@ var __extends = (this && this.__extends) || (function () {
             this.propertiesValueMatches = 0;
             this.primaryValueMatches = 0;
             this.enumValueMatch = false;
-            this.enumValues = null;
+            this.enumValues = undefined;
         }
         ValidationResult.prototype.hasProblems = function () {
             return !!this.problems.length;
@@ -298,7 +298,7 @@ var __extends = (this && this.__extends) || (function () {
             if (this.root) {
                 return Json.findNodeAtOffset(this.root, offset, includeRightBound);
             }
-            return void 0;
+            return undefined;
         };
         JSONDocument.prototype.visit = function (visitor) {
             if (this.root) {
@@ -324,11 +324,10 @@ var __extends = (this && this.__extends) || (function () {
                     return jsonLanguageTypes_1.Diagnostic.create(range, p.message, p.severity, p.code);
                 });
             }
-            return null;
+            return undefined;
         };
         JSONDocument.prototype.getMatchingSchemas = function (schema, focusOffset, exclude) {
             if (focusOffset === void 0) { focusOffset = -1; }
-            if (exclude === void 0) { exclude = null; }
             var matchingSchemas = new SchemaCollector(focusOffset, exclude);
             if (this.root && schema) {
                 validate(this.root, schema, new ValidationResult(), matchingSchemas);
@@ -338,10 +337,11 @@ var __extends = (this && this.__extends) || (function () {
         return JSONDocument;
     }());
     exports.JSONDocument = JSONDocument;
-    function validate(node, schema, validationResult, matchingSchemas) {
-        if (!node || !matchingSchemas.include(node)) {
+    function validate(n, schema, validationResult, matchingSchemas) {
+        if (!n || !matchingSchemas.include(n)) {
             return;
         }
+        var node = n;
         switch (node.type) {
             case 'object':
                 _validateObjectNode(node, schema, validationResult, matchingSchemas);
@@ -409,7 +409,7 @@ var __extends = (this && this.__extends) || (function () {
             var testAlternatives = function (alternatives, maxOneMatch) {
                 var matches = [];
                 // remember the best match that is used for error messages
-                var bestMatch = null;
+                var bestMatch = undefined;
                 for (var _i = 0, alternatives_1 = alternatives; _i < alternatives_1.length; _i++) {
                     var subSchemaRef = alternatives_1[_i];
                     var subSchema = asSchema(subSchemaRef);
@@ -450,7 +450,7 @@ var __extends = (this && this.__extends) || (function () {
                         message: localize('oneOfWarning', "Matches multiple schemas when only one must validate.")
                     });
                 }
-                if (bestMatch !== null) {
+                if (bestMatch) {
                     validationResult.merge(bestMatch.validationResult);
                     validationResult.propertiesMatches += bestMatch.validationResult.propertiesMatches;
                     validationResult.propertiesValueMatches += bestMatch.validationResult.propertiesValueMatches;
@@ -555,13 +555,13 @@ var __extends = (this && this.__extends) || (function () {
                 if (objects_1.isBoolean(exclusive) && exclusive) {
                     return limit;
                 }
-                return void 0;
+                return undefined;
             }
             function getLimit(limit, exclusive) {
                 if (!objects_1.isBoolean(exclusive) || !exclusive) {
                     return limit;
                 }
-                return void 0;
+                return undefined;
             }
             var exclusiveMinimum = getExclusiveLimit(schema.minimum, schema.exclusiveMinimum);
             if (objects_1.isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
@@ -940,7 +940,7 @@ var __extends = (this && this.__extends) || (function () {
         var lastProblemOffset = -1;
         var text = textDocument.getText();
         var scanner = Json.createScanner(text, false);
-        var commentRanges = config && config.collectComments ? [] : void 0;
+        var commentRanges = config && config.collectComments ? [] : undefined;
         function _scanNext() {
             while (true) {
                 var token_1 = scanner.scan();
@@ -976,7 +976,7 @@ var __extends = (this && this.__extends) || (function () {
             }
         }
         function _error(message, code, node, skipUntilAfter, skipUntil) {
-            if (node === void 0) { node = null; }
+            if (node === void 0) { node = undefined; }
             if (skipUntilAfter === void 0) { skipUntilAfter = []; }
             if (skipUntil === void 0) { skipUntil = []; }
             var start = scanner.getTokenOffset();
@@ -1039,7 +1039,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _parseArray(parent) {
             if (scanner.getToken() !== 3 /* OpenBracketToken */) {
-                return null;
+                return undefined;
             }
             var node = new ArrayASTNodeImpl(parent, scanner.getTokenOffset());
             _scanNext(); // consume OpenBracketToken
@@ -1062,9 +1062,9 @@ var __extends = (this && this.__extends) || (function () {
                 else if (needsComma) {
                     _error(localize('ExpectedComma', 'Expected comma'), jsonLanguageTypes_1.ErrorCode.CommaExpected);
                 }
-                var item = _parseValue(node, count++);
+                var item = _parseValue(node);
                 if (!item) {
-                    _error(localize('PropertyExpected', 'Value expected'), jsonLanguageTypes_1.ErrorCode.ValueExpected, null, [], [4 /* CloseBracketToken */, 5 /* CommaToken */]);
+                    _error(localize('PropertyExpected', 'Value expected'), jsonLanguageTypes_1.ErrorCode.ValueExpected, undefined, [], [4 /* CloseBracketToken */, 5 /* CommaToken */]);
                 }
                 else {
                     node.items.push(item);
@@ -1076,8 +1076,9 @@ var __extends = (this && this.__extends) || (function () {
             }
             return _finalize(node, true);
         }
+        var keyPlaceholder = new StringASTNodeImpl(undefined, 0, 0);
         function _parseProperty(parent, keysSeen) {
-            var node = new PropertyASTNodeImpl(parent, scanner.getTokenOffset());
+            var node = new PropertyASTNodeImpl(parent, scanner.getTokenOffset(), keyPlaceholder);
             var key = _parseString(node);
             if (!key) {
                 if (scanner.getToken() === 16 /* Unknown */) {
@@ -1089,7 +1090,7 @@ var __extends = (this && this.__extends) || (function () {
                     _scanNext(); // consume Unknown
                 }
                 else {
-                    return null;
+                    return undefined;
                 }
             }
             node.keyNode = key;
@@ -1115,7 +1116,7 @@ var __extends = (this && this.__extends) || (function () {
                     return node;
                 }
             }
-            var value = _parseValue(node, key.value);
+            var value = _parseValue(node);
             if (!value) {
                 return _error(localize('ValueExpected', 'Value expected'), jsonLanguageTypes_1.ErrorCode.ValueExpected, node, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
             }
@@ -1125,7 +1126,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _parseObject(parent) {
             if (scanner.getToken() !== 1 /* OpenBraceToken */) {
-                return null;
+                return undefined;
             }
             var node = new ObjectASTNodeImpl(parent, scanner.getTokenOffset());
             var keysSeen = Object.create(null);
@@ -1150,7 +1151,7 @@ var __extends = (this && this.__extends) || (function () {
                 }
                 var property = _parseProperty(node, keysSeen);
                 if (!property) {
-                    _error(localize('PropertyExpected', 'Property expected'), jsonLanguageTypes_1.ErrorCode.PropertyExpected, null, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+                    _error(localize('PropertyExpected', 'Property expected'), jsonLanguageTypes_1.ErrorCode.PropertyExpected, undefined, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
                 }
                 else {
                     node.properties.push(property);
@@ -1164,7 +1165,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _parseString(parent) {
             if (scanner.getToken() !== 10 /* StringLiteral */) {
-                return null;
+                return undefined;
             }
             var node = new StringASTNodeImpl(parent, scanner.getTokenOffset());
             node.value = scanner.getTokenValue();
@@ -1172,7 +1173,7 @@ var __extends = (this && this.__extends) || (function () {
         }
         function _parseNumber(parent) {
             if (scanner.getToken() !== 11 /* NumericLiteral */) {
-                return null;
+                return undefined;
             }
             var node = new NumberASTNodeImpl(parent, scanner.getTokenOffset());
             if (scanner.getTokenError() === 0 /* None */) {
@@ -1201,16 +1202,16 @@ var __extends = (this && this.__extends) || (function () {
                 case 9 /* FalseKeyword */:
                     return _finalize(new BooleanASTNodeImpl(parent, false, scanner.getTokenOffset()), true);
                 default:
-                    return null;
+                    return undefined;
             }
         }
-        function _parseValue(parent, name) {
+        function _parseValue(parent) {
             return _parseArray(parent) || _parseObject(parent) || _parseString(parent) || _parseNumber(parent) || _parseLiteral(parent);
         }
-        var _root = null;
+        var _root = undefined;
         var token = _scanNext();
         if (token !== 17 /* EOF */) {
-            _root = _parseValue(null, null);
+            _root = _parseValue(_root);
             if (!_root) {
                 _error(localize('Invalid symbol', 'Expected a JSON object, array or literal.'), jsonLanguageTypes_1.ErrorCode.Undefined);
             }

package/lib/umd/services/configuration.js

@@ -16,7 +16,7 @@
     var nls = require("vscode-nls");
     var localize = nls.loadMessageBundle();
     exports.schemaContributions = {
-        schemaAssociations: {},
+        schemaAssociations: [],
         schemas: {
             // refer to the latest schema
             'http://json-schema.org/schema#': {
@@ -527,7 +527,7 @@
         var schema = exports.schemaContributions.schemas[schemaName];
         for (var property in schema.properties) {
             var propertyObject = schema.properties[property];
-            if (propertyObject === true) {
+            if (typeof propertyObject === 'boolean') {
                 propertyObject = schema.properties[property] = {};
             }
             var description = descriptions[property];

package/lib/umd/services/jsonCompletion.js

@@ -32,12 +32,12 @@
             this.contributions = contributions;
             this.promiseConstructor = promiseConstructor;
             this.clientCapabilities = clientCapabilities;
-            this.templateVarIdCounter = 0;
         }
         JSONCompletion.prototype.doResolve = function (item) {
             for (var i = this.contributions.length - 1; i >= 0; i--) {
-                if (this.contributions[i].resolveCompletion) {
-                    var resolver = this.contributions[i].resolveCompletion(item);
+                var resolveCompletion = this.contributions[i].resolveCompletion;
+                if (resolveCompletion) {
+                    var resolver = resolveCompletion(item);
                     if (resolver) {
                         return resolver;
                     }
@@ -65,7 +65,7 @@
                 }
             }
             var currentWord = this.getCurrentWord(document, offset);
-            var overwriteRange = null;
+            var overwriteRange;
             if (node && (node.type === 'string' || node.type === 'number' || node.type === 'boolean' || node.type === 'null')) {
                 overwriteRange = jsonLanguageTypes_1.Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
             }
@@ -90,7 +90,7 @@
                                 label = shortendedLabel;
                             }
                         }
-                        if (overwriteRange) {
+                        if (overwriteRange && suggestion.insertText !== undefined) {
                             suggestion.textEdit = jsonLanguageTypes_1.TextEdit.replace(overwriteRange, suggestion.insertText);
                         }
                         if (supportsCommitCharacters) {
@@ -121,7 +121,7 @@
                 var collectionPromises = [];
                 var addValue = true;
                 var currentKey = '';
-                var currentProperty = null;
+                var currentProperty = undefined;
                 if (node) {
                     if (node.type === 'string') {
                         var parent = node.parent;
@@ -171,7 +171,7 @@
                         collector.add({
                             kind: jsonLanguageTypes_1.CompletionItemKind.Property,
                             label: _this.getLabelForValue(currentWord),
-                            insertText: _this.getInsertTextForProperty(currentWord, null, false, separatorAfter_1),
+                            insertText: _this.getInsertTextForProperty(currentWord, undefined, false, separatorAfter_1),
                             insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet, documentation: '',
                         });
                         collector.setAsIncomplete();
@@ -221,7 +221,10 @@
                                     filterText: _this.getFilterTextForValue(key),
                                     documentation: _this.fromMarkup(propertySchema.markdownDescription) || propertySchema.description || '',
                                 };
-                                if (strings_1.endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                                if (propertySchema.suggestSortText !== undefined) {
+                                    proposal.sortText = propertySchema.suggestSortText;
+                                }
+                                if (proposal.insertText && strings_1.endsWith(proposal.insertText, "$1" + separatorAfter)) {
                                     proposal.command = {
                                         title: 'Suggest',
                                         command: 'editor.action.triggerSuggest'
@@ -273,7 +276,7 @@
                 collector.add({
                     kind: jsonLanguageTypes_1.CompletionItemKind.Property,
                     label: '$schema',
-                    insertText: this.getInsertTextForProperty('$schema', null, true, ''),
+                    insertText: this.getInsertTextForProperty('$schema', undefined, true, ''),
                     insertTextFormat: jsonLanguageTypes_1.InsertTextFormat.Snippet, documentation: '',
                     filterText: this.getFilterTextForValue("$schema")
                 });
@@ -305,7 +308,7 @@
             }
             var separatorAfter = this.evaluateSeparatorAfter(document, offsetForSeparator);
             var collectSuggestionsForValues = function (value) {
-                if (!Parser.contains(value.parent, offset, true)) {
+                if (value.parent && !Parser.contains(value.parent, offset, true)) {
                     collector.add({
                         kind: _this.getSuggestionKind(value.type),
                         label: _this.getLabelTextForMatchingNode(value, document),
@@ -318,7 +321,7 @@
                 }
             };
             if (node.type === 'property') {
-                if (offset > node.colonOffset) {
+                if (offset > (node.colonOffset || 0)) {
                     var valueNode = node.valueNode;
                     if (valueNode && (offset > (valueNode.offset + valueNode.length) || valueNode.type === 'object' || valueNode.type === 'array')) {
                         return;
@@ -354,10 +357,9 @@
             }
         };
         JSONCompletion.prototype.getValueCompletions = function (schema, doc, node, offset, document, collector, types) {
-            var _this = this;
             var offsetForSeparator = offset;
-            var parentKey = null;
-            var valueNode = null;
+            var parentKey = undefined;
+            var valueNode = undefined;
             if (node && (node.type === 'string' || node.type === 'number' || node.type === 'boolean' || node.type === 'null')) {
                 offsetForSeparator = node.offset + node.length;
                 valueNode = node;
@@ -367,7 +369,7 @@
                 this.addSchemaValueCompletions(schema.schema, '', collector, types);
                 return;
             }
-            if ((node.type === 'property') && offset > node.colonOffset) {
+            if ((node.type === 'property') && offset > (node.colonOffset || 0)) {
                 var valueNode_1 = node.valueNode;
                 if (valueNode_1 && offset > (valueNode_1.offset + valueNode_1.length)) {
                     return; // we are past the value node
@@ -375,39 +377,40 @@
                 parentKey = node.keyNode.value;
                 node = node.parent;
             }
-            if (node && (parentKey !== null || node.type === 'array')) {
-                var separatorAfter_2 = this.evaluateSeparatorAfter(document, offsetForSeparator);
+            if (node && (parentKey !== undefined || node.type === 'array')) {
+                var separatorAfter = this.evaluateSeparatorAfter(document, offsetForSeparator);
                 var matchingSchemas = doc.getMatchingSchemas(schema.schema, node.offset, valueNode);
-                matchingSchemas.forEach(function (s) {
+                for (var _i = 0, matchingSchemas_1 = matchingSchemas; _i < matchingSchemas_1.length; _i++) {
+                    var s = matchingSchemas_1[_i];
                     if (s.node === node && !s.inverted && s.schema) {
                         if (node.type === 'array' && s.schema.items) {
                             if (Array.isArray(s.schema.items)) {
-                                var index = _this.findItemAtOffset(node, document, offset);
+                                var index = this.findItemAtOffset(node, document, offset);
                                 if (index < s.schema.items.length) {
-                                    _this.addSchemaValueCompletions(s.schema.items[index], separatorAfter_2, collector, types);
+                                    this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, collector, types);
                                 }
                             }
                             else {
-                                _this.addSchemaValueCompletions(s.schema.items, separatorAfter_2, collector, types);
+                                this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types);
                             }
                         }
-                        if (s.schema.properties) {
+                        if (s.schema.properties && parentKey !== undefined) {
                             var propertySchema = s.schema.properties[parentKey];
                             if (propertySchema) {
-                                _this.addSchemaValueCompletions(propertySchema, separatorAfter_2, collector, types);
+                                this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types);
                             }
                         }
                     }
-                });
+                }
                 if (parentKey === '$schema' && !node.parent) {
-                    this.addDollarSchemaCompletions(separatorAfter_2, collector);
+                    this.addDollarSchemaCompletions(separatorAfter, collector);
                 }
                 if (types['boolean']) {
-                    this.addBooleanValueCompletion(true, separatorAfter_2, collector);
-                    this.addBooleanValueCompletion(false, separatorAfter_2, collector);
+                    this.addBooleanValueCompletion(true, separatorAfter, collector);
+                    this.addBooleanValueCompletion(false, separatorAfter, collector);
                 }
                 if (types['null']) {
-                    this.addNullValueCompletion(separatorAfter_2, collector);
+                    this.addNullValueCompletion(separatorAfter, collector);
                 }
             }
         };
@@ -424,10 +427,10 @@
                 if (node.type === 'string' || node.type === 'number' || node.type === 'boolean' || node.type === 'null') {
                     node = node.parent;
                 }
-                if ((node.type === 'property') && offset > node.colonOffset) {
+                if (node && (node.type === 'property') && offset > (node.colonOffset || 0)) {
                     var parentKey_4 = node.keyNode.value;
                     var valueNode = node.valueNode;
-                    if (!valueNode || offset <= (valueNode.offset + valueNode.length)) {
+                    if ((!valueNode || offset <= (valueNode.offset + valueNode.length)) && node.parent) {
                         var location_2 = Parser.getNodePath(node.parent);
                         this.contributions.forEach(function (contribution) {
                             var collectPromise = contribution.collectValueCompletions(document.uri, location_2, parentKey_4, collector);
@@ -522,6 +525,9 @@
                         label = label || insertText,
                             filterText = insertText.replace(/[\n]/g, ''); // remove new lines
                     }
+                    else {
+                        return;
+                    }
                     collector.add({
                         kind: _this.getSuggestionKind(type),
                         label: label,
@@ -533,7 +539,7 @@
                     hasProposals = true;
                 });
             }
-            if (!hasProposals && typeof schema.items === 'object' && !Array.isArray(schema.items)) {
+            if (!hasProposals && typeof schema.items === 'object' && !Array.isArray(schema.items) && arrayDepth < 5 /* beware of recursion */) {
                 this.addDefaultValueCompletions(schema.items, separatorAfter, collector, arrayDepth + 1);
             }
         };
@@ -575,7 +581,7 @@
             if (Array.isArray(type)) {
                 type.forEach(function (t) { return types[t] = true; });
             }
-            else {
+            else if (type) {
                 types[type] = true;
             }
         };
@@ -688,7 +694,7 @@
         JSONCompletion.prototype.getSuggestionKind = function (type) {
             if (Array.isArray(type)) {
                 var array = type;
-                type = array.length > 0 ? array[0] : null;
+                type = array.length > 0 ? array[0] : undefined;
             }
             if (!type) {
                 return jsonLanguageTypes_1.CompletionItemKind.Value;

package/lib/umd/services/jsonDefinition.js

@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "../jsonLanguageTypes"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var jsonLanguageTypes_1 = require("../jsonLanguageTypes");
+    function findDefinition(document, position, doc) {
+        var offset = document.offsetAt(position);
+        var node = doc.getNodeFromOffset(offset, true);
+        if (!node || !isRef(node)) {
+            return Promise.resolve([]);
+        }
+        var propertyNode = node.parent;
+        var valueNode = propertyNode.valueNode;
+        var path = valueNode.value;
+        var targetNode = findTargetNode(doc, path);
+        if (!targetNode) {
+            return Promise.resolve([]);
+        }
+        var definition = {
+            targetUri: document.uri,
+            originSelectionRange: createRange(document, valueNode),
+            targetRange: createRange(document, targetNode),
+            targetSelectionRange: createRange(document, targetNode)
+        };
+        return Promise.resolve([definition]);
+    }
+    exports.findDefinition = findDefinition;
+    function createRange(document, node) {
+        return jsonLanguageTypes_1.Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
+    }
+    function isRef(node) {
+        return node.type === 'string' &&
+            node.parent &&
+            node.parent.type === 'property' &&
+            node.parent.valueNode === node &&
+            node.parent.keyNode.value === "$ref" ||
+            false;
+    }
+    function findTargetNode(doc, path) {
+        var tokens = parseJSONPointer(path);
+        if (!tokens) {
+            return null;
+        }
+        return findNode(tokens, doc.root);
+    }
+    function findNode(pointer, node) {
+        if (!node) {
+            return null;
+        }
+        if (pointer.length === 0) {
+            return node;
+        }
+        var token = pointer.shift();
+        if (node && node.type === 'object') {
+            var propertyNode = node.properties.find(function (propertyNode) { return propertyNode.keyNode.value === token; });
+            if (!propertyNode) {
+                return null;
+            }
+            return findNode(pointer, propertyNode.valueNode);
+        }
+        else if (node && node.type === 'array') {
+            if (token.match(/^(0|[1-9][0-9]*)$/)) {
+                var index = Number.parseInt(token);
+                var arrayItem = node.items[index];
+                if (!arrayItem) {
+                    return null;
+                }
+                return findNode(pointer, arrayItem);
+            }
+        }
+        return null;
+    }
+    function parseJSONPointer(path) {
+        if (path === "#") {
+            return [];
+        }
+        if (path[0] !== '#' || path[1] !== '/') {
+            return null;
+        }
+        return path.substring(2).split(/\//).map(unescape);
+    }
+    function unescape(str) {
+        return str.replace(/~1/g, '/').replace(/~0/g, '~');
+    }
+});

package/lib/umd/services/jsonDocumentSymbols.js

@@ -26,9 +26,9 @@
             if (context === void 0) { context = { resultLimit: Number.MAX_VALUE }; }
             var root = doc.root;
             if (!root) {
-                return null;
+                return [];
             }
-            var limit = context.resultLimit;
+            var limit = context.resultLimit || Number.MAX_VALUE;
             // special handling for key bindings
             var resourceString = document.uri;
             if ((resourceString === 'vscode://defaultsettings/keybindings.json') || Strings.endsWith(resourceString.toLowerCase(), '/user/keybindings.json')) {
@@ -103,9 +103,9 @@
             if (context === void 0) { context = { resultLimit: Number.MAX_VALUE }; }
             var root = doc.root;
             if (!root) {
-                return null;
+                return [];
             }
-            var limit = context.resultLimit;
+            var limit = context.resultLimit || Number.MAX_VALUE;
             // special handling for key bindings
             var resourceString = document.uri;
             if ((resourceString === 'vscode://defaultsettings/keybindings.json') || Strings.endsWith(resourceString.toLowerCase(), '/user/keybindings.json')) {

package/lib/umd/services/jsonHover.js

@@ -56,11 +56,11 @@
                 }
             }
             return this.schemaService.getSchemaForResource(document.uri, doc).then(function (schema) {
-                if (schema) {
+                if (schema && node) {
                     var matchingSchemas = doc.getMatchingSchemas(schema.schema, node.offset);
-                    var title_1 = null;
-                    var markdownDescription_1 = null;
-                    var markdownEnumValueDescription_1 = null, enumValue_1 = null;
+                    var title_1 = undefined;
+                    var markdownDescription_1 = undefined;
+                    var markdownEnumValueDescription_1 = undefined, enumValue_1 = undefined;
                     matchingSchemas.every(function (s) {
                         if (s.node === node && !s.inverted && s.schema) {
                             title_1 = title_1 || s.schema.title;
@@ -112,7 +112,7 @@
             var res = plain.replace(/([^\n\r])(\r?\n)([^\n\r])/gm, '$1\n\n$3'); // single new lines to \n\n (Markdown paragraph)
             return res.replace(/[\\`*_{}[\]()#+\-.!]/g, "\\$&"); // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
         }
-        return void 0;
+        return undefined;
     }
     function toMarkdownCodeBlock(content) {
         // see https://daringfireball.net/projects/markdown/syntax#precode