npm - vscode-json-languageservice - Versions diffs - 3.8.4 → 3.10.0 - Mend

vscode-json-languageservice 3.8.4 → 3.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md +9 -0
package/README.md +46 -17
package/lib/esm/jsonLanguageService.d.ts +2 -0
package/lib/esm/jsonLanguageService.js +3 -2
package/lib/esm/jsonLanguageTypes.d.ts +9 -0
package/lib/esm/jsonLanguageTypes.js +1 -0
package/lib/esm/parser/jsonParser.js +6 -31
package/lib/esm/services/{jsonDefinition.js → jsonLinks.js} +19 -29
package/lib/esm/services/jsonSchemaService.js +11 -1
package/lib/esm/services/jsonValidation.js +7 -5
package/lib/umd/jsonLanguageService.d.ts +2 -0
package/lib/umd/jsonLanguageService.js +4 -3
package/lib/umd/jsonLanguageTypes.d.ts +9 -0
package/lib/umd/jsonLanguageTypes.js +1 -0
package/lib/umd/parser/jsonParser.js +6 -31
package/lib/umd/services/{jsonDefinition.js → jsonLinks.js} +21 -31
package/lib/umd/services/jsonSchemaService.js +11 -1
package/lib/umd/services/jsonValidation.js +7 -5
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,12 @@
+3.10.0 / 2020-11-03
+=================
+ * new API `findLinks` return links for local `$ref` links. Replaces `findDefinition` which no longer returns results ( kept for API compatibility)
+3.9.0 / 2020-09-28
+=================
+ * new API `DocumentLanguageSettings.schemaValidation`. The severity of problems from schema validation. If set to 'ignore', schema validation will be skipped. If not set, 'warning' is used.
+ * new API `DocumentLanguageSettings.schemaRequest`. The severity of problems that occurred while resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
 3.8.0 / 2020-08-02
 =================
  * new API `LanguageService.getMatchingSchemas`. Matches a document against its schema and list all AST nodes along with the matching sub schemas.

package/README.md CHANGED Viewed

@@ -1,4 +1,5 @@
 # vscode-json-languageservice
 JSON language service extracted from VSCode to be reused, e.g in the Monaco editor.
 [![npm Package](https://img.shields.io/npm/v/vscode-json-languageservice.svg?style=flat-square)](https://www.npmjs.org/package/vscode-json-languageservice)
@@ -6,24 +7,52 @@ JSON language service extracted from VSCode to be reused, e.g in the Monaco edit
 [![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?
-----
+## Why?
 The _vscode-json-languageservice_ contains the language smarts behind the JSON editing experience of Visual Studio Code
 and the Monaco editor.
- - *doValidation* analyses an input string and returns syntax and lint errors.
- - *doComplete* provides completion proposals for a given location. *doResolve* resolves a completion proposal
- - *doResolve* resolves a completion proposals.
- - *doHover* provides a hover text for a given location.
- - *findDocumentSymbols* provides all symbols in the given document
- - *findDocumentColors* provides all color symbols in the given document, *getColorPresentations* returns available color formats for a color symbol.
- - *format* formats the code at the given range.
- - *getFoldingRanges* gets folding ranges for the given document
- - *getSelectionRanges* gets selection ranges for a given location.
- - *getMatchingSchemas* matches a document against its schema and returns all AST nodes along with the matching sub schemas
- - use *parseJSONDocument* create a JSON document from source code, or *newJSONDocument* to create the document from an AST.
-Installation
-------------
+- _doValidation_ analyses an input string and returns syntax and lint errors.
+- _doComplete_ provides completion proposals for a given location.
+- _doResolve_ resolves a completion proposals.
+- _doHover_ provides a hover text for a given location.
+- _findDocumentSymbols_ provides all symbols in the given document.
+- _findDocumentColors_ provides all color symbols in the given document.
+- _getColorPresentations_ returns available color formats for a color symbol.
+- _format_ formats the code at the given range.
+- _getFoldingRanges_ gets folding ranges for the given document.
+- _getSelectionRanges_ gets selection ranges for a given location.
+- _getMatchingSchemas_ matches a document against its schema and returns all AST nodes along with the matching sub schemas.
+- _parseJSONDocument_ creates a JSON document from source code.
+- _newJSONDocument_ creates a JSON document from an AST.
+For the complete API see [jsonLanguageService.ts](./src/jsonLanguageService.ts) and [jsonLanguageTypes.ts](./src/jsonLanguageTypes.ts)
+## Installation
     npm install --save vscode-json-languageservice
+## Development
+    git clone https://github.com/microsoft/vscode-json-languageservice
+    cd vscode-json-languageservice
+    yarn
+Use `yarn test` to compile and run tests
+### How can I run and debug the service?
+- open the folder in VSCode.
+- set breakpoints, e.g. in `jsonCompletion.ts`
+- run the Unit tests from the run viewlet and wait until a breakpoint is hit:
+  ![image](https://user-images.githubusercontent.com/6461412/94239202-bdad4e80-ff11-11ea-99c3-cb9dbeb1c0b2.png)
+### How can I run and debug the service inside an instance of VSCode?
+- run VSCode out of sources setup as described here: https://github.com/Microsoft/vscode/wiki/How-to-Contribute
+- use `yarn link vscode-json-languageservice` in `vscode/extensions/json-language-features/server` to run VSCode with the latest changes from `vscode-json-languageservice`
+- run VSCode out of source (`vscode/scripts/code.sh|bat`) and open a `.json` file
+- in VSCode window that is open on the `vscode-json-languageservice` sources, run command `Debug: Attach to Node process` and pick the `code-oss` process with the `json-language-features` path
+  ![image](https://user-images.githubusercontent.com/6461412/94242925-061b3b00-ff17-11ea-8c17-8da15268f1a1.png)
+- set breakpoints, e.g. in `jsonCompletion.ts`
+- in the instance run from sources, invoke code completion in the `.json` file

package/lib/esm/jsonLanguageService.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+import { DocumentLink } from 'vscode-languageserver-types';
 export declare type JSONDocument = {
     root: ASTNode | undefined;
     getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
@@ -24,5 +25,6 @@ export interface LanguageService {
     getFoldingRanges(document: TextDocument, context?: FoldingRangesContext): FoldingRange[];
     getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
     findDefinition(document: TextDocument, position: Position, doc: JSONDocument): Thenable<DefinitionLink[]>;
+    findLinks(document: TextDocument, doc: JSONDocument): Thenable<DocumentLink[]>;
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/esm/jsonLanguageService.js CHANGED Viewed

@@ -13,7 +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';
+import { findLinks } from './services/jsonLinks';
 export * from './jsonLanguageTypes';
 export function getLanguageService(params) {
     var promise = params.promiseConstructor || Promise;
@@ -48,7 +48,8 @@ export function getLanguageService(params) {
         doHover: jsonHover.doHover.bind(jsonHover),
         getFoldingRanges: getFoldingRanges,
         getSelectionRanges: getSelectionRanges,
-        findDefinition: findDefinition,
+        findDefinition: function () { return Promise.resolve([]); },
+        findLinks: findLinks,
         format: function (d, r, o) {
             var range = undefined;
             if (r) {

package/lib/esm/jsonLanguageTypes.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export { TextDocument, Range, TextEdit, JSONSchema, JSONWorkerContribution, JSON
 export declare enum ErrorCode {
     Undefined = 0,
     EnumValueMismatch = 1,
+    Deprecated = 2,
     UnexpectedEndOfComment = 257,
     UnexpectedEndOfString = 258,
     UnexpectedEndOfNumber = 259,
@@ -98,6 +99,14 @@ export interface DocumentLanguageSettings {
      * The severity of reported trailing commas. If not set, trailing commas will be reported as errors.
      */
     trailingCommas?: SeverityLevel;
+    /**
+     * The severity of problems from schema validation. If set to 'ignore', schema validation will be skipped. If not set, 'warning' is used.
+     */
+    schemaValidation?: SeverityLevel;
+    /**
+     * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
+     */
+    schemaRequest?: SeverityLevel;
 }
 export interface SchemaConfiguration {
     /**

package/lib/esm/jsonLanguageTypes.js CHANGED Viewed

@@ -12,6 +12,7 @@ export var ErrorCode;
 (function (ErrorCode) {
     ErrorCode[ErrorCode["Undefined"] = 0] = "Undefined";
     ErrorCode[ErrorCode["EnumValueMismatch"] = 1] = "EnumValueMismatch";
+    ErrorCode[ErrorCode["Deprecated"] = 2] = "Deprecated";
     ErrorCode[ErrorCode["UnexpectedEndOfComment"] = 257] = "UnexpectedEndOfComment";
     ErrorCode[ErrorCode["UnexpectedEndOfString"] = 258] = "UnexpectedEndOfString";
     ErrorCode[ErrorCode["UnexpectedEndOfNumber"] = 259] = "UnexpectedEndOfNumber";

package/lib/esm/parser/jsonParser.js CHANGED Viewed

@@ -299,13 +299,15 @@ var JSONDocument = /** @class */ (function () {
             doVisit_1(this.root);
         }
     };
-    JSONDocument.prototype.validate = function (textDocument, schema) {
+    JSONDocument.prototype.validate = function (textDocument, schema, severity) {
+        if (severity === void 0) { severity = DiagnosticSeverity.Warning; }
         if (this.root && schema) {
             var validationResult = new ValidationResult();
             validate(this.root, schema, validationResult, NoOpSchemaCollector.instance);
             return validationResult.problems.map(function (p) {
+                var _a;
                 var range = Range.create(textDocument.positionAt(p.location.offset), textDocument.positionAt(p.location.offset + p.location.length));
-                return Diagnostic.create(range, p.message, p.severity, p.code);
+                return Diagnostic.create(range, p.message, (_a = p.severity) !== null && _a !== void 0 ? _a : severity, p.code);
             });
         }
         return undefined;
@@ -352,7 +354,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!schema.type.some(matchesType)) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: schema.errorMessage || localize('typeArrayMismatchWarning', 'Incorrect type. Expected one of {0}.', schema.type.join(', '))
                 });
             }
@@ -361,7 +362,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!matchesType(schema.type)) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: schema.errorMessage || localize('typeMismatchWarning', 'Incorrect type. Expected "{0}".', schema.type)
                 });
             }
@@ -380,7 +380,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!subValidationResult.hasProblems()) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('notSchemaWarning', "Matches a schema that is not allowed.")
                 });
             }
@@ -430,7 +429,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (matches.length > 1 && maxOneMatch) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: 1 },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('oneOfWarning', "Matches multiple schemas when only one must validate.")
                 });
             }
@@ -491,7 +489,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!enumValueMatch) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     code: ErrorCode.EnumValueMismatch,
                     message: schema.errorMessage || localize('enumWarning', 'Value is not accepted. Valid values: {0}.', schema.enum.map(function (v) { return JSON.stringify(v); }).join(', '))
                 });
@@ -502,7 +499,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!equals(val, schema.const)) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     code: ErrorCode.EnumValueMismatch,
                     message: schema.errorMessage || localize('constWarning', 'Value must be {0}.', JSON.stringify(schema.const))
                 });
@@ -517,7 +513,8 @@ function validate(n, schema, validationResult, matchingSchemas) {
             validationResult.problems.push({
                 location: { offset: node.parent.offset, length: node.parent.length },
                 severity: DiagnosticSeverity.Warning,
-                message: schema.deprecationMessage
+                message: schema.deprecationMessage,
+                code: ErrorCode.Deprecated
             });
         }
     }
@@ -554,7 +551,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (remainder !== 0) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('multipleOfWarning', 'Value is not divisible by {0}.', schema.multipleOf)
                 });
             }
@@ -578,7 +574,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
         if (isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
-                severity: DiagnosticSeverity.Warning,
                 message: localize('exclusiveMinimumWarning', 'Value is below the exclusive minimum of {0}.', exclusiveMinimum)
             });
         }
@@ -586,7 +581,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
         if (isNumber(exclusiveMaximum) && val >= exclusiveMaximum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
-                severity: DiagnosticSeverity.Warning,
                 message: localize('exclusiveMaximumWarning', 'Value is above the exclusive maximum of {0}.', exclusiveMaximum)
             });
         }
@@ -594,7 +588,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
         if (isNumber(minimum) && val < minimum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
-                severity: DiagnosticSeverity.Warning,
                 message: localize('minimumWarning', 'Value is below the minimum of {0}.', minimum)
             });
         }
@@ -602,7 +595,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
         if (isNumber(maximum) && val > maximum) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
-                severity: DiagnosticSeverity.Warning,
                 message: localize('maximumWarning', 'Value is above the maximum of {0}.', maximum)
             });
         }
@@ -611,14 +603,12 @@ function validate(n, schema, validationResult, matchingSchemas) {
         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 (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)
             });
         }
@@ -627,7 +617,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!regex.test(node.value)) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: schema.patternErrorMessage || schema.errorMessage || localize('patternWarning', 'String does not match the pattern of "{0}".', schema.pattern)
                 });
             }
@@ -653,7 +642,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                         if (errorMessage) {
                             validationResult.problems.push({
                                 location: { offset: node.offset, length: node.length },
-                                severity: DiagnosticSeverity.Warning,
                                 message: schema.patternErrorMessage || schema.errorMessage || localize('uriFormatWarning', 'String is not a URI: {0}', errorMessage)
                             });
                         }
@@ -668,7 +656,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                     if (!node.value || !format.pattern.exec(node.value)) {
                         validationResult.problems.push({
                             location: { offset: node.offset, length: node.length },
-                            severity: DiagnosticSeverity.Warning,
                             message: schema.patternErrorMessage || schema.errorMessage || format.errorMessage
                         });
                     }
@@ -703,7 +690,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                 else if (schema.additionalItems === false) {
                     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.length)
                     });
                 }
@@ -730,7 +716,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (!doesContain) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: schema.errorMessage || localize('requiredItemMissingWarning', 'Array does not contain required item.')
                 });
             }
@@ -738,14 +723,12 @@ function validate(n, schema, validationResult, matchingSchemas) {
         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 (isNumber(schema.maxItems) && node.items.length > schema.maxItems) {
             validationResult.problems.push({
                 location: { offset: node.offset, length: node.length },
-                severity: DiagnosticSeverity.Warning,
                 message: localize('maxItemsWarning', 'Array has too many items. Expected {0} or fewer.', schema.maxItems)
             });
         }
@@ -757,7 +740,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (duplicates) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('uniqueItemsWarning', 'Array has duplicate items.')
                 });
             }
@@ -780,7 +762,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                     var location = keyNode ? { offset: keyNode.offset, length: keyNode.length } : { offset: node.offset, length: 1 };
                     validationResult.problems.push({
                         location: location,
-                        severity: DiagnosticSeverity.Warning,
                         message: localize('MissingRequiredPropWarning', 'Missing property "{0}".', propertyName)
                     });
                 }
@@ -805,7 +786,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                             var propertyNode = child.parent;
                             validationResult.problems.push({
                                 location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                                severity: DiagnosticSeverity.Warning,
                                 message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                             });
                         }
@@ -838,7 +818,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                                     var propertyNode = child.parent;
                                     validationResult.problems.push({
                                         location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                                        severity: DiagnosticSeverity.Warning,
                                         message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                                     });
                                 }
@@ -877,7 +856,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                         var propertyNode = child.parent;
                         validationResult.problems.push({
                             location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                            severity: DiagnosticSeverity.Warning,
                             message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                         });
                     }
@@ -888,7 +866,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (node.properties.length > schema.maxProperties) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('MaxPropWarning', 'Object has more properties than limit of {0}.', schema.maxProperties)
                 });
             }
@@ -897,7 +874,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
             if (node.properties.length < schema.minProperties) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: DiagnosticSeverity.Warning,
                     message: localize('MinPropWarning', 'Object has fewer properties than the required number of {0}', schema.minProperties)
                 });
             }
@@ -914,7 +890,6 @@ function validate(n, schema, validationResult, matchingSchemas) {
                             if (!seenKeys[requiredProp]) {
                                 validationResult.problems.push({
                                     location: { offset: node.offset, length: node.length },
-                                    severity: DiagnosticSeverity.Warning,
                                     message: localize('RequiredDependentPropWarning', 'Object is missing property {0} required by property {1}.', requiredProp, key)
                                 });
                             }

package/lib/esm/services/{jsonDefinition.js → jsonLinks.js} RENAMED Viewed

@@ -3,37 +3,27 @@
  *  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]);
+export function findLinks(document, doc) {
+    var links = [];
+    doc.visit(function (node) {
+        var _a;
+        if (node.type === "property" && node.keyNode.value === "$ref" && ((_a = node.valueNode) === null || _a === void 0 ? void 0 : _a.type) === 'string') {
+            var path = node.valueNode.value;
+            var targetNode = findTargetNode(doc, path);
+            if (targetNode) {
+                var targetPos = document.positionAt(targetNode.offset);
+                links.push({
+                    target: document.uri + "#" + (targetPos.line + 1) + "," + (targetPos.character + 1),
+                    range: createRange(document, node.valueNode)
+                });
+            }
+        }
+        return true;
+    });
+    return Promise.resolve(links);
 }
 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;
+    return Range.create(document.positionAt(node.offset + 1), document.positionAt(node.offset + node.length - 1));
 }
 function findTargetNode(doc, path) {
     var tokens = parseJSONPointer(path);

package/lib/esm/services/jsonSchemaService.js CHANGED Viewed

@@ -445,9 +445,10 @@ var JSONSchemaService = /** @class */ (function () {
         }
         var seen = Object.create(null);
         var schemas = [];
+        var normalizedResource = normalizeResourceForMatching(resource);
         for (var _i = 0, _a = this.filePatternAssociations; _i < _a.length; _i++) {
             var entry = _a[_i];
-            if (entry.matchesPattern(resource)) {
+            if (entry.matchesPattern(normalizedResource)) {
                 for (var _b = 0, _c = entry.getURIs(); _b < _c.length; _b++) {
                     var schemaId = _c[_b];
                     if (!seen[schemaId]) {
@@ -500,6 +501,15 @@ function normalizeId(id) {
         return id;
     }
 }
+function normalizeResourceForMatching(resource) {
+    // remove querues and fragments, normalize drive capitalization
+    try {
+        return URI.parse(resource).with({ fragment: null, query: null }).toString();
+    }
+    catch (e) {
+        return resource;
+    }
+}
 function toDisplayString(url) {
     try {
         var uri = URI.parse(url);

package/lib/esm/services/jsonValidation.js CHANGED Viewed

@@ -37,22 +37,24 @@ var JSONValidation = /** @class */ (function () {
         var getDiagnostics = function (schema) {
             var trailingCommaSeverity = documentSettings ? toDiagnosticSeverity(documentSettings.trailingCommas) : DiagnosticSeverity.Error;
             var commentSeverity = documentSettings ? toDiagnosticSeverity(documentSettings.comments) : _this.commentSeverity;
+            var schemaValidation = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaValidation) ? toDiagnosticSeverity(documentSettings.schemaValidation) : DiagnosticSeverity.Warning;
+            var schemaRequest = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaRequest) ? toDiagnosticSeverity(documentSettings.schemaRequest) : DiagnosticSeverity.Warning;
             if (schema) {
-                if (schema.errors.length && jsonDocument.root) {
+                if (schema.errors.length && jsonDocument.root && schemaRequest) {
                     var astRoot = jsonDocument.root;
                     var property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
                     if (property && property.keyNode.value === '$schema') {
                         var node = property.valueNode || property;
                         var range = Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                        addProblem(Diagnostic.create(range, schema.errors[0], DiagnosticSeverity.Warning, ErrorCode.SchemaResolveError));
+                        addProblem(Diagnostic.create(range, schema.errors[0], schemaRequest, ErrorCode.SchemaResolveError));
                     }
                     else {
                         var range = Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                        addProblem(Diagnostic.create(range, schema.errors[0], DiagnosticSeverity.Warning, ErrorCode.SchemaResolveError));
+                        addProblem(Diagnostic.create(range, schema.errors[0], schemaRequest, ErrorCode.SchemaResolveError));
                     }
                 }
-                else {
-                    var semanticErrors = jsonDocument.validate(textDocument, schema.schema);
+                else if (schemaValidation) {
+                    var semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
                     if (semanticErrors) {
                         semanticErrors.forEach(addProblem);
                     }

package/lib/umd/jsonLanguageService.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { Thenable, ASTNode, Color, ColorInformation, ColorPresentation, LanguageServiceParams, LanguageSettings, DocumentLanguageSettings, FoldingRange, JSONSchema, SelectionRange, FoldingRangesContext, DocumentSymbolsContext, ColorInformationContext as DocumentColorsContext, TextDocument, Position, CompletionItem, CompletionList, Hover, Range, SymbolInformation, Diagnostic, TextEdit, FormattingOptions, DocumentSymbol, DefinitionLink, MatchingSchema } from './jsonLanguageTypes';
+import { DocumentLink } from 'vscode-languageserver-types';
 export declare type JSONDocument = {
     root: ASTNode | undefined;
     getNodeFromOffset(offset: number, includeRightBound?: boolean): ASTNode | undefined;
@@ -24,5 +25,6 @@ export interface LanguageService {
     getFoldingRanges(document: TextDocument, context?: FoldingRangesContext): FoldingRange[];
     getSelectionRanges(document: TextDocument, positions: Position[], doc: JSONDocument): SelectionRange[];
     findDefinition(document: TextDocument, position: Position, doc: JSONDocument): Thenable<DefinitionLink[]>;
+    findLinks(document: TextDocument, doc: JSONDocument): Thenable<DocumentLink[]>;
 }
 export declare function getLanguageService(params: LanguageServiceParams): LanguageService;

package/lib/umd/jsonLanguageService.js CHANGED Viewed

@@ -18,7 +18,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./services/jsonCompletion", "./services/jsonHover", "./services/jsonValidation", "./services/jsonDocumentSymbols", "./parser/jsonParser", "./services/configuration", "./services/jsonSchemaService", "./services/jsonFolding", "./services/jsonSelectionRanges", "jsonc-parser", "./jsonLanguageTypes", "./services/jsonDefinition", "./jsonLanguageTypes"], factory);
+        define(["require", "exports", "./services/jsonCompletion", "./services/jsonHover", "./services/jsonValidation", "./services/jsonDocumentSymbols", "./parser/jsonParser", "./services/configuration", "./services/jsonSchemaService", "./services/jsonFolding", "./services/jsonSelectionRanges", "jsonc-parser", "./jsonLanguageTypes", "./services/jsonLinks", "./jsonLanguageTypes"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -35,7 +35,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     var jsonSelectionRanges_1 = require("./services/jsonSelectionRanges");
     var jsonc_parser_1 = require("jsonc-parser");
     var jsonLanguageTypes_1 = require("./jsonLanguageTypes");
-    var jsonDefinition_1 = require("./services/jsonDefinition");
+    var jsonLinks_1 = require("./services/jsonLinks");
     __exportStar(require("./jsonLanguageTypes"), exports);
     function getLanguageService(params) {
         var promise = params.promiseConstructor || Promise;
@@ -70,7 +70,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
             doHover: jsonHover.doHover.bind(jsonHover),
             getFoldingRanges: jsonFolding_1.getFoldingRanges,
             getSelectionRanges: jsonSelectionRanges_1.getSelectionRanges,
-            findDefinition: jsonDefinition_1.findDefinition,
+            findDefinition: function () { return Promise.resolve([]); },
+            findLinks: jsonLinks_1.findLinks,
             format: function (d, r, o) {
                 var range = undefined;
                 if (r) {

package/lib/umd/jsonLanguageTypes.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ export { TextDocument, Range, TextEdit, JSONSchema, JSONWorkerContribution, JSON
 export declare enum ErrorCode {
     Undefined = 0,
     EnumValueMismatch = 1,
+    Deprecated = 2,
     UnexpectedEndOfComment = 257,
     UnexpectedEndOfString = 258,
     UnexpectedEndOfNumber = 259,
@@ -98,6 +99,14 @@ export interface DocumentLanguageSettings {
      * The severity of reported trailing commas. If not set, trailing commas will be reported as errors.
      */
     trailingCommas?: SeverityLevel;
+    /**
+     * The severity of problems from schema validation. If set to 'ignore', schema validation will be skipped. If not set, 'warning' is used.
+     */
+    schemaValidation?: SeverityLevel;
+    /**
+     * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used.
+     */
+    schemaRequest?: SeverityLevel;
 }
 export interface SchemaConfiguration {
     /**

package/lib/umd/jsonLanguageTypes.js CHANGED Viewed

@@ -48,6 +48,7 @@
     (function (ErrorCode) {
         ErrorCode[ErrorCode["Undefined"] = 0] = "Undefined";
         ErrorCode[ErrorCode["EnumValueMismatch"] = 1] = "EnumValueMismatch";
+        ErrorCode[ErrorCode["Deprecated"] = 2] = "Deprecated";
         ErrorCode[ErrorCode["UnexpectedEndOfComment"] = 257] = "UnexpectedEndOfComment";
         ErrorCode[ErrorCode["UnexpectedEndOfString"] = 258] = "UnexpectedEndOfString";
         ErrorCode[ErrorCode["UnexpectedEndOfNumber"] = 259] = "UnexpectedEndOfNumber";

package/lib/umd/parser/jsonParser.js CHANGED Viewed

@@ -316,13 +316,15 @@ var __extends = (this && this.__extends) || (function () {
                 doVisit_1(this.root);
             }
         };
-        JSONDocument.prototype.validate = function (textDocument, schema) {
+        JSONDocument.prototype.validate = function (textDocument, schema, severity) {
+            if (severity === void 0) { severity = jsonLanguageTypes_1.DiagnosticSeverity.Warning; }
             if (this.root && schema) {
                 var validationResult = new ValidationResult();
                 validate(this.root, schema, validationResult, NoOpSchemaCollector.instance);
                 return validationResult.problems.map(function (p) {
+                    var _a;
                     var range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(p.location.offset), textDocument.positionAt(p.location.offset + p.location.length));
-                    return jsonLanguageTypes_1.Diagnostic.create(range, p.message, p.severity, p.code);
+                    return jsonLanguageTypes_1.Diagnostic.create(range, p.message, (_a = p.severity) !== null && _a !== void 0 ? _a : severity, p.code);
                 });
             }
             return undefined;
@@ -369,7 +371,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!schema.type.some(matchesType)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: schema.errorMessage || localize('typeArrayMismatchWarning', 'Incorrect type. Expected one of {0}.', schema.type.join(', '))
                     });
                 }
@@ -378,7 +379,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!matchesType(schema.type)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: schema.errorMessage || localize('typeMismatchWarning', 'Incorrect type. Expected "{0}".', schema.type)
                     });
                 }
@@ -397,7 +397,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!subValidationResult.hasProblems()) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('notSchemaWarning', "Matches a schema that is not allowed.")
                     });
                 }
@@ -447,7 +446,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (matches.length > 1 && maxOneMatch) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: 1 },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('oneOfWarning', "Matches multiple schemas when only one must validate.")
                     });
                 }
@@ -508,7 +506,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!enumValueMatch) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         code: jsonLanguageTypes_1.ErrorCode.EnumValueMismatch,
                         message: schema.errorMessage || localize('enumWarning', 'Value is not accepted. Valid values: {0}.', schema.enum.map(function (v) { return JSON.stringify(v); }).join(', '))
                     });
@@ -519,7 +516,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!objects_1.equals(val, schema.const)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         code: jsonLanguageTypes_1.ErrorCode.EnumValueMismatch,
                         message: schema.errorMessage || localize('constWarning', 'Value must be {0}.', JSON.stringify(schema.const))
                     });
@@ -534,7 +530,8 @@ var __extends = (this && this.__extends) || (function () {
                 validationResult.problems.push({
                     location: { offset: node.parent.offset, length: node.parent.length },
                     severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
-                    message: schema.deprecationMessage
+                    message: schema.deprecationMessage,
+                    code: jsonLanguageTypes_1.ErrorCode.Deprecated
                 });
             }
         }
@@ -571,7 +568,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (remainder !== 0) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('multipleOfWarning', 'Value is not divisible by {0}.', schema.multipleOf)
                     });
                 }
@@ -595,7 +591,6 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(exclusiveMinimum) && val <= exclusiveMinimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('exclusiveMinimumWarning', 'Value is below the exclusive minimum of {0}.', exclusiveMinimum)
                 });
             }
@@ -603,7 +598,6 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(exclusiveMaximum) && val >= exclusiveMaximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('exclusiveMaximumWarning', 'Value is above the exclusive maximum of {0}.', exclusiveMaximum)
                 });
             }
@@ -611,7 +605,6 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(minimum) && val < minimum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('minimumWarning', 'Value is below the minimum of {0}.', minimum)
                 });
             }
@@ -619,7 +612,6 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(maximum) && val > maximum) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('maximumWarning', 'Value is above the maximum of {0}.', maximum)
                 });
             }
@@ -628,14 +620,12 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(schema.minLength) && node.value.length < schema.minLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('minLengthWarning', 'String is shorter than the minimum length of {0}.', schema.minLength)
                 });
             }
             if (objects_1.isNumber(schema.maxLength) && node.value.length > schema.maxLength) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('maxLengthWarning', 'String is longer than the maximum length of {0}.', schema.maxLength)
                 });
             }
@@ -644,7 +634,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!regex.test(node.value)) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: schema.patternErrorMessage || schema.errorMessage || localize('patternWarning', 'String does not match the pattern of "{0}".', schema.pattern)
                     });
                 }
@@ -670,7 +659,6 @@ var __extends = (this && this.__extends) || (function () {
                             if (errorMessage) {
                                 validationResult.problems.push({
                                     location: { offset: node.offset, length: node.length },
-                                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                     message: schema.patternErrorMessage || schema.errorMessage || localize('uriFormatWarning', 'String is not a URI: {0}', errorMessage)
                                 });
                             }
@@ -685,7 +673,6 @@ var __extends = (this && this.__extends) || (function () {
                         if (!node.value || !format.pattern.exec(node.value)) {
                             validationResult.problems.push({
                                 location: { offset: node.offset, length: node.length },
-                                severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                 message: schema.patternErrorMessage || schema.errorMessage || format.errorMessage
                             });
                         }
@@ -720,7 +707,6 @@ var __extends = (this && this.__extends) || (function () {
                     else if (schema.additionalItems === false) {
                         validationResult.problems.push({
                             location: { offset: node.offset, length: node.length },
-                            severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                             message: localize('additionalItemsWarning', 'Array has too many items according to schema. Expected {0} or fewer.', subSchemas.length)
                         });
                     }
@@ -747,7 +733,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (!doesContain) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: schema.errorMessage || localize('requiredItemMissingWarning', 'Array does not contain required item.')
                     });
                 }
@@ -755,14 +740,12 @@ var __extends = (this && this.__extends) || (function () {
             if (objects_1.isNumber(schema.minItems) && node.items.length < schema.minItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('minItemsWarning', 'Array has too few items. Expected {0} or more.', schema.minItems)
                 });
             }
             if (objects_1.isNumber(schema.maxItems) && node.items.length > schema.maxItems) {
                 validationResult.problems.push({
                     location: { offset: node.offset, length: node.length },
-                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                     message: localize('maxItemsWarning', 'Array has too many items. Expected {0} or fewer.', schema.maxItems)
                 });
             }
@@ -774,7 +757,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (duplicates) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('uniqueItemsWarning', 'Array has duplicate items.')
                     });
                 }
@@ -797,7 +779,6 @@ var __extends = (this && this.__extends) || (function () {
                         var location = keyNode ? { offset: keyNode.offset, length: keyNode.length } : { offset: node.offset, length: 1 };
                         validationResult.problems.push({
                             location: location,
-                            severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                             message: localize('MissingRequiredPropWarning', 'Missing property "{0}".', propertyName)
                         });
                     }
@@ -822,7 +803,6 @@ var __extends = (this && this.__extends) || (function () {
                                 var propertyNode = child.parent;
                                 validationResult.problems.push({
                                     location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                                    severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                     message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                                 });
                             }
@@ -855,7 +835,6 @@ var __extends = (this && this.__extends) || (function () {
                                         var propertyNode = child.parent;
                                         validationResult.problems.push({
                                             location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                                            severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                             message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                                         });
                                     }
@@ -894,7 +873,6 @@ var __extends = (this && this.__extends) || (function () {
                             var propertyNode = child.parent;
                             validationResult.problems.push({
                                 location: { offset: propertyNode.keyNode.offset, length: propertyNode.keyNode.length },
-                                severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                 message: schema.errorMessage || localize('DisallowedExtraPropWarning', 'Property {0} is not allowed.', propertyName)
                             });
                         }
@@ -905,7 +883,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (node.properties.length > schema.maxProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('MaxPropWarning', 'Object has more properties than limit of {0}.', schema.maxProperties)
                     });
                 }
@@ -914,7 +891,6 @@ var __extends = (this && this.__extends) || (function () {
                 if (node.properties.length < schema.minProperties) {
                     validationResult.problems.push({
                         location: { offset: node.offset, length: node.length },
-                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                         message: localize('MinPropWarning', 'Object has fewer properties than the required number of {0}', schema.minProperties)
                     });
                 }
@@ -931,7 +907,6 @@ var __extends = (this && this.__extends) || (function () {
                                 if (!seenKeys[requiredProp]) {
                                     validationResult.problems.push({
                                         location: { offset: node.offset, length: node.length },
-                                        severity: jsonLanguageTypes_1.DiagnosticSeverity.Warning,
                                         message: localize('RequiredDependentPropWarning', 'Object is missing property {0} required by property {1}.', requiredProp, key)
                                     });
                                 }

package/lib/umd/services/{jsonDefinition.js → jsonLinks.js} RENAMED Viewed

@@ -13,40 +13,30 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.findDefinition = void 0;
+    exports.findLinks = void 0;
     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]);
+    function findLinks(document, doc) {
+        var links = [];
+        doc.visit(function (node) {
+            var _a;
+            if (node.type === "property" && node.keyNode.value === "$ref" && ((_a = node.valueNode) === null || _a === void 0 ? void 0 : _a.type) === 'string') {
+                var path = node.valueNode.value;
+                var targetNode = findTargetNode(doc, path);
+                if (targetNode) {
+                    var targetPos = document.positionAt(targetNode.offset);
+                    links.push({
+                        target: document.uri + "#" + (targetPos.line + 1) + "," + (targetPos.character + 1),
+                        range: createRange(document, node.valueNode)
+                    });
+                }
+            }
+            return true;
+        });
+        return Promise.resolve(links);
     }
-    exports.findDefinition = findDefinition;
+    exports.findLinks = findLinks;
     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;
+        return jsonLanguageTypes_1.Range.create(document.positionAt(node.offset + 1), document.positionAt(node.offset + node.length - 1));
     }
     function findTargetNode(doc, path) {
         var tokens = parseJSONPointer(path);

package/lib/umd/services/jsonSchemaService.js CHANGED Viewed

@@ -457,9 +457,10 @@
             }
             var seen = Object.create(null);
             var schemas = [];
+            var normalizedResource = normalizeResourceForMatching(resource);
             for (var _i = 0, _a = this.filePatternAssociations; _i < _a.length; _i++) {
                 var entry = _a[_i];
-                if (entry.matchesPattern(resource)) {
+                if (entry.matchesPattern(normalizedResource)) {
                     for (var _b = 0, _c = entry.getURIs(); _b < _c.length; _b++) {
                         var schemaId = _c[_b];
                         if (!seen[schemaId]) {
@@ -512,6 +513,15 @@
             return id;
         }
     }
+    function normalizeResourceForMatching(resource) {
+        // remove querues and fragments, normalize drive capitalization
+        try {
+            return vscode_uri_1.URI.parse(resource).with({ fragment: null, query: null }).toString();
+        }
+        catch (e) {
+            return resource;
+        }
+    }
     function toDisplayString(url) {
         try {
             var uri = vscode_uri_1.URI.parse(url);

package/lib/umd/services/jsonValidation.js CHANGED Viewed

@@ -49,22 +49,24 @@
             var getDiagnostics = function (schema) {
                 var trailingCommaSeverity = documentSettings ? toDiagnosticSeverity(documentSettings.trailingCommas) : jsonLanguageTypes_1.DiagnosticSeverity.Error;
                 var commentSeverity = documentSettings ? toDiagnosticSeverity(documentSettings.comments) : _this.commentSeverity;
+                var schemaValidation = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaValidation) ? toDiagnosticSeverity(documentSettings.schemaValidation) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
+                var schemaRequest = (documentSettings === null || documentSettings === void 0 ? void 0 : documentSettings.schemaRequest) ? toDiagnosticSeverity(documentSettings.schemaRequest) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
                 if (schema) {
-                    if (schema.errors.length && jsonDocument.root) {
+                    if (schema.errors.length && jsonDocument.root && schemaRequest) {
                         var astRoot = jsonDocument.root;
                         var property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
                         if (property && property.keyNode.value === '$schema') {
                             var node = property.valueNode || property;
                             var range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], jsonLanguageTypes_1.DiagnosticSeverity.Warning, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
+                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], schemaRequest, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
                         }
                         else {
                             var range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], jsonLanguageTypes_1.DiagnosticSeverity.Warning, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
+                            addProblem(jsonLanguageTypes_1.Diagnostic.create(range, schema.errors[0], schemaRequest, jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
                         }
                     }
-                    else {
-                        var semanticErrors = jsonDocument.validate(textDocument, schema.schema);
+                    else if (schemaValidation) {
+                        var semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation);
                         if (semanticErrors) {
                             semanticErrors.forEach(addProblem);
                         }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "3.8.4",
+  "version": "3.10.0",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",