vscode-json-languageservice 3.4.12 → 3.7.0

package/lib/esm/jsonLanguageService.d.ts

@@ -1,4 +1,4 @@
-import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol } from './jsonLanguageTypes';
+import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink } from './jsonLanguageTypes';
 export declare type JSONDocument = {};
 export * from './jsonLanguageTypes';
 export interface LanguageService {
@@ -19,5 +19,6 @@ export interface LanguageService {
     format(document: TextDocument, range: Range, options: FormattingOptions): TextEdit[];
     getFoldingRanges(document: TextDocument, context?: FoldingRangesContext): FoldingRange[];
     getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
+    findDefinition(document: TextDocument, position: Position, doc: JSONDocument): Thenable<DefinitionLink[]>;
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/esm/jsonLanguageService.js

@@ -13,6 +13,7 @@ import { getFoldingRanges } from './services/jsonFolding';
 import { getSelectionRanges } from './services/jsonSelectionRanges';
 import { format as formatJSON } from 'jsonc-parser';
 import { Range, TextEdit } from './jsonLanguageTypes';
+import { findDefinition } from './services/jsonDefinition';
 export * from './jsonLanguageTypes';
 export function getLanguageService(params) {
     var promise = params.promiseConstructor || Promise;
@@ -46,8 +47,9 @@ export function getLanguageService(params) {
         doHover: jsonHover.doHover.bind(jsonHover),
         getFoldingRanges: getFoldingRanges,
         getSelectionRanges: getSelectionRanges,
+        findDefinition: findDefinition,
         format: function (d, r, o) {
-            var range = void 0;
+            var range = undefined;
             if (r) {
                 var offset = d.offsetAt(r.start);
                 var length = d.offsetAt(r.end) - offset;

package/lib/esm/jsonLanguageTypes.d.ts

@@ -88,7 +88,7 @@ export interface LanguageSettings {
 export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
 export interface DocumentLanguageSettings {
     /**
-     * The severity of reported comments. If not set, 'LanguageSettings.allowComments' defines wheter comments are ignored or reported as errors.
+     * The severity of reported comments. If not set, 'LanguageSettings.allowComments' defines whether comments are ignored or reported as errors.
      */
     comments?: SeverityLevel;
     /**
@@ -102,7 +102,9 @@ export interface SchemaConfiguration {
      */
     uri: string;
     /**
-     * A list of file names that are associated to the schema. The '*' wildcard can be used. For example '*.schema.json', 'package.json'
+     * A list of file path patterns that are associated to the schema. The '*' wildcard can be used. Exclusion patterns starting with '!'.
+     * For example '*.schema.json', 'package.json', '!foo*.schema.json'.
+     * A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'.
      */
     fileMatch?: string[];
     /**

package/lib/esm/jsonSchema.d.ts

@@ -61,6 +61,7 @@ export interface JSONSchema {
     markdownEnumDescriptions?: string[];
     markdownDescription?: string;
     doNotSuggest?: boolean;
+    suggestSortText?: string;
     allowComments?: boolean;
     allowTrailingCommas?: boolean;
 }

package/lib/esm/parser/jsonParser.js

@@ -29,6 +29,7 @@ var formats = {
 };
 var ASTNodeImpl = /** @class */ (function () {
     function ASTNodeImpl(parent, offset, length) {
+        if (length === void 0) { length = 0; }
         this.offset = offset;
         this.length = length;
         this.parent = parent;
@@ -111,10 +112,11 @@ var StringASTNodeImpl = /** @class */ (function (_super) {
 export { 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", {
@@ -159,7 +161,6 @@ export var EnumMatch;
 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 = [];
@@ -168,8 +169,7 @@ var SchemaCollector = /** @class */ (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);
@@ -201,7 +201,7 @@ var ValidationResult = /** @class */ (function () {
         this.propertiesValueMatches = 0;
         this.primaryValueMatches = 0;
         this.enumValueMatch = false;
-        this.enumValues = null;
+        this.enumValues = undefined;
     }
     ValidationResult.prototype.hasProblems = function () {
         return !!this.problems.length;
@@ -282,7 +282,7 @@ var JSONDocument = /** @class */ (function () {
         if (this.root) {
             return Json.findNodeAtOffset(this.root, offset, includeRightBound);
         }
-        return void 0;
+        return undefined;
     };
     JSONDocument.prototype.visit = function (visitor) {
         if (this.root) {
@@ -308,11 +308,10 @@ var JSONDocument = /** @class */ (function () {
                 return 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);
@@ -322,10 +321,11 @@ var JSONDocument = /** @class */ (function () {
     return JSONDocument;
 }());
 export { 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);
@@ -393,7 +393,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
         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);
@@ -434,7 +434,7 @@ function validate(node, schema, validationResult, matchingSchemas) {
                     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;
@@ -539,13 +539,13 @@ function validate(node, schema, validationResult, matchingSchemas) {
             if (isBoolean(exclusive) && exclusive) {
                 return limit;
             }
-            return void 0;
+            return undefined;
         }
         function getLimit(limit, exclusive) {
             if (!isBoolean(exclusive) || !exclusive) {
                 return limit;
             }
-            return void 0;
+            return undefined;
         }
         var exclusiveMinimum = getExclusiveLimit(schema.minimum, schema.exclusiveMinimum);
         if (isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
@@ -924,7 +924,7 @@ export function parse(textDocument, config) {
     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();
@@ -960,7 +960,7 @@ export function parse(textDocument, config) {
         }
     }
     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();
@@ -1023,7 +1023,7 @@ export function parse(textDocument, config) {
     }
     function _parseArray(parent) {
         if (scanner.getToken() !== 3 /* OpenBracketToken */) {
-            return null;
+            return undefined;
         }
         var node = new ArrayASTNodeImpl(parent, scanner.getTokenOffset());
         _scanNext(); // consume OpenBracketToken
@@ -1046,9 +1046,9 @@ export function parse(textDocument, config) {
             else if (needsComma) {
                 _error(localize('ExpectedComma', 'Expected comma'), ErrorCode.CommaExpected);
             }
-            var item = _parseValue(node, count++);
+            var item = _parseValue(node);
             if (!item) {
-                _error(localize('PropertyExpected', 'Value expected'), ErrorCode.ValueExpected, null, [], [4 /* CloseBracketToken */, 5 /* CommaToken */]);
+                _error(localize('PropertyExpected', 'Value expected'), ErrorCode.ValueExpected, undefined, [], [4 /* CloseBracketToken */, 5 /* CommaToken */]);
             }
             else {
                 node.items.push(item);
@@ -1060,8 +1060,9 @@ export function parse(textDocument, config) {
         }
         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 */) {
@@ -1073,7 +1074,7 @@ export function parse(textDocument, config) {
                 _scanNext(); // consume Unknown
             }
             else {
-                return null;
+                return undefined;
             }
         }
         node.keyNode = key;
@@ -1099,7 +1100,7 @@ export function parse(textDocument, config) {
                 return node;
             }
         }
-        var value = _parseValue(node, key.value);
+        var value = _parseValue(node);
         if (!value) {
             return _error(localize('ValueExpected', 'Value expected'), ErrorCode.ValueExpected, node, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
         }
@@ -1109,7 +1110,7 @@ export function parse(textDocument, config) {
     }
     function _parseObject(parent) {
         if (scanner.getToken() !== 1 /* OpenBraceToken */) {
-            return null;
+            return undefined;
         }
         var node = new ObjectASTNodeImpl(parent, scanner.getTokenOffset());
         var keysSeen = Object.create(null);
@@ -1134,7 +1135,7 @@ export function parse(textDocument, config) {
             }
             var property = _parseProperty(node, keysSeen);
             if (!property) {
-                _error(localize('PropertyExpected', 'Property expected'), ErrorCode.PropertyExpected, null, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+                _error(localize('PropertyExpected', 'Property expected'), ErrorCode.PropertyExpected, undefined, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
             }
             else {
                 node.properties.push(property);
@@ -1148,7 +1149,7 @@ export function parse(textDocument, config) {
     }
     function _parseString(parent) {
         if (scanner.getToken() !== 10 /* StringLiteral */) {
-            return null;
+            return undefined;
         }
         var node = new StringASTNodeImpl(parent, scanner.getTokenOffset());
         node.value = scanner.getTokenValue();
@@ -1156,7 +1157,7 @@ export function parse(textDocument, config) {
     }
     function _parseNumber(parent) {
         if (scanner.getToken() !== 11 /* NumericLiteral */) {
-            return null;
+            return undefined;
         }
         var node = new NumberASTNodeImpl(parent, scanner.getTokenOffset());
         if (scanner.getTokenError() === 0 /* None */) {
@@ -1185,16 +1186,16 @@ export function parse(textDocument, config) {
             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.'), ErrorCode.Undefined);
         }

package/lib/esm/services/configuration.js

@@ -5,7 +5,7 @@
 import * as nls from 'vscode-nls';
 var localize = nls.loadMessageBundle();
 export var schemaContributions = {
-    schemaAssociations: {},
+    schemaAssociations: [],
     schemas: {
         // refer to the latest schema
         'http://json-schema.org/schema#': {
@@ -516,7 +516,7 @@ for (var schemaName in schemaContributions.schemas) {
     var schema = 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/esm/services/jsonCompletion.js

@@ -21,12 +21,12 @@ var JSONCompletion = /** @class */ (function () {
         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;
                 }
@@ -54,7 +54,7 @@ var JSONCompletion = /** @class */ (function () {
             }
         }
         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 = Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
         }
@@ -79,7 +79,7 @@ var JSONCompletion = /** @class */ (function () {
                             label = shortendedLabel;
                         }
                     }
-                    if (overwriteRange) {
+                    if (overwriteRange && suggestion.insertText !== undefined) {
                         suggestion.textEdit = TextEdit.replace(overwriteRange, suggestion.insertText);
                     }
                     if (supportsCommitCharacters) {
@@ -110,7 +110,7 @@ var JSONCompletion = /** @class */ (function () {
             var collectionPromises = [];
             var addValue = true;
             var currentKey = '';
-            var currentProperty = null;
+            var currentProperty = undefined;
             if (node) {
                 if (node.type === 'string') {
                     var parent = node.parent;
@@ -160,7 +160,7 @@ var JSONCompletion = /** @class */ (function () {
                     collector.add({
                         kind: CompletionItemKind.Property,
                         label: _this.getLabelForValue(currentWord),
-                        insertText: _this.getInsertTextForProperty(currentWord, null, false, separatorAfter_1),
+                        insertText: _this.getInsertTextForProperty(currentWord, undefined, false, separatorAfter_1),
                         insertTextFormat: InsertTextFormat.Snippet, documentation: '',
                     });
                     collector.setAsIncomplete();
@@ -210,7 +210,10 @@ var JSONCompletion = /** @class */ (function () {
                                 filterText: _this.getFilterTextForValue(key),
                                 documentation: _this.fromMarkup(propertySchema.markdownDescription) || propertySchema.description || '',
                             };
-                            if (endsWith(proposal.insertText, "$1" + separatorAfter)) {
+                            if (propertySchema.suggestSortText !== undefined) {
+                                proposal.sortText = propertySchema.suggestSortText;
+                            }
+                            if (proposal.insertText && endsWith(proposal.insertText, "$1" + separatorAfter)) {
                                 proposal.command = {
                                     title: 'Suggest',
                                     command: 'editor.action.triggerSuggest'
@@ -262,7 +265,7 @@ var JSONCompletion = /** @class */ (function () {
             collector.add({
                 kind: CompletionItemKind.Property,
                 label: '$schema',
-                insertText: this.getInsertTextForProperty('$schema', null, true, ''),
+                insertText: this.getInsertTextForProperty('$schema', undefined, true, ''),
                 insertTextFormat: InsertTextFormat.Snippet, documentation: '',
                 filterText: this.getFilterTextForValue("$schema")
             });
@@ -294,7 +297,7 @@ var JSONCompletion = /** @class */ (function () {
         }
         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),
@@ -307,7 +310,7 @@ var JSONCompletion = /** @class */ (function () {
             }
         };
         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;
@@ -343,10 +346,9 @@ var JSONCompletion = /** @class */ (function () {
         }
     };
     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;
@@ -356,7 +358,7 @@ var JSONCompletion = /** @class */ (function () {
             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
@@ -364,39 +366,40 @@ var JSONCompletion = /** @class */ (function () {
             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);
             }
         }
     };
@@ -413,10 +416,10 @@ var JSONCompletion = /** @class */ (function () {
             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);
@@ -511,6 +514,9 @@ var JSONCompletion = /** @class */ (function () {
                     label = label || insertText,
                         filterText = insertText.replace(/[\n]/g, ''); // remove new lines
                 }
+                else {
+                    return;
+                }
                 collector.add({
                     kind: _this.getSuggestionKind(type),
                     label: label,
@@ -522,7 +528,7 @@ var JSONCompletion = /** @class */ (function () {
                 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);
         }
     };
@@ -564,7 +570,7 @@ var JSONCompletion = /** @class */ (function () {
         if (Array.isArray(type)) {
             type.forEach(function (t) { return types[t] = true; });
         }
-        else {
+        else if (type) {
             types[type] = true;
         }
     };
@@ -677,7 +683,7 @@ var JSONCompletion = /** @class */ (function () {
     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 CompletionItemKind.Value;

package/lib/esm/services/jsonDefinition.js

@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 '../jsonLanguageTypes';
+export 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]);
+}
+function createRange(document, node) {
+    return 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/esm/services/jsonDocumentSymbols.js

@@ -15,9 +15,9 @@ var JSONDocumentSymbols = /** @class */ (function () {
         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')) {
@@ -92,9 +92,9 @@ var JSONDocumentSymbols = /** @class */ (function () {
         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')) {