vscode-json-languageservice 5.7.0 → 5.7.2

package/lib/esm/services/configuration.js

@@ -482,7 +482,7 @@ const descriptions = {
     maxProperties: l10n.t("The maximum number of properties an object can have. Inclusive."),
     minProperties: l10n.t("The minimum number of properties an object can have. Inclusive."),
     required: l10n.t("An array of strings that lists the names of all properties required on this object."),
-    additionalProperties: l10n.t("Either a schema or a boolean. If a schema, used to validate all properties not matched by 'properties', 'propertyNames', or 'patternProperties'. If false, any properties not defined by the adajacent keywords will cause this schema to fail."),
+    additionalProperties: l10n.t("Either a schema or a boolean. If a schema, used to validate all properties not matched by 'properties', 'propertyNames', or 'patternProperties'. If false, any properties not defined by the adjacent keywords will cause this schema to fail."),
     definitions: l10n.t("Not used for validation. Place subschemas here that you wish to reference inline with $ref."),
     properties: l10n.t("A map of property names to schemas for each property."),
     patternProperties: l10n.t("A map of regular expressions on property names to schemas for matching properties."),

package/lib/esm/services/jsonHover.js

@@ -95,7 +95,9 @@ function toMarkdown(plain) {
         return plain
             .trim()
             .replace(/[\\`*_{}[\]()<>#+\-.!]/g, '\\$&') // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
-            .replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape spaces tabs
+            .replace(/(^ +)/mg, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape leading spaces on each line
+            .replace(/( {2,})/g, (_match, g1) => ' ' + '&nbsp;'.repeat(g1.length - 1)) // escape consecutive spaces
+            .replace(/(\t+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length * 4)) // escape tabs
             .replace(/\n/g, '\\\n'); // escape new lines
     }
     return undefined;

package/lib/esm/services/jsonSchemaService.js

@@ -10,6 +10,7 @@ import { SchemaDraft, ErrorCode } from '../jsonLanguageTypes';
 import * as l10n from '@vscode/l10n';
 import { createRegex } from '../utils/glob';
 import { isObject, isString } from '../utils/objects';
+import { Range } from 'vscode-languageserver-types';
 const BANG = '!';
 const PATH_SEP = '/';
 class FilePatternAssociation {
@@ -102,8 +103,12 @@ export class UnresolvedSchema {
         this.errors = errors;
     }
 }
-function toDiagnostic(message, code) {
-    return { message, code };
+function toDiagnostic(message, code, relatedURL) {
+    const relatedInformation = relatedURL ? [{
+            location: { uri: relatedURL, range: Range.create(0, 0, 0, 0) },
+            message
+        }] : undefined;
+    return { message, code, relatedInformation };
 }
 export class ResolvedSchema {
     constructor(schema, errors = [], warnings = [], schemaDraft) {
@@ -265,23 +270,23 @@ export class JSONSchemaService {
     loadSchema(url) {
         if (!this.requestService) {
             const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
-            return this.promise.resolve(new UnresolvedSchema({}, [toDiagnostic(errorMessage, ErrorCode.SchemaResolveError)]));
+            return this.promise.resolve(new UnresolvedSchema({}, [toDiagnostic(errorMessage, ErrorCode.SchemaResolveError, url)]));
         }
         return this.requestService(url).then(content => {
             if (!content) {
                 const errorMessage = l10n.t('Unable to load schema from \'{0}\': No content.', toDisplayString(url));
-                return new UnresolvedSchema({}, [toDiagnostic(errorMessage, ErrorCode.SchemaResolveError)]);
+                return new UnresolvedSchema({}, [toDiagnostic(errorMessage, ErrorCode.SchemaResolveError, url)]);
             }
             const errors = [];
             if (content.charCodeAt(0) === 65279) {
-                errors.push(toDiagnostic(l10n.t('Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)), ErrorCode.SchemaResolveError));
+                errors.push(toDiagnostic(l10n.t('Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)), ErrorCode.SchemaResolveError, url));
                 content = content.trimStart();
             }
             let schemaContent = {};
             const jsonErrors = [];
             schemaContent = Json.parse(content, jsonErrors);
             if (jsonErrors.length) {
-                errors.push(toDiagnostic(l10n.t('Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset), ErrorCode.SchemaResolveError));
+                errors.push(toDiagnostic(l10n.t('Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset), ErrorCode.SchemaResolveError, url));
             }
             return new UnresolvedSchema(schemaContent, errors);
         }, (error) => {
@@ -303,7 +308,7 @@ export class JSONSchemaService {
                 errorCode += code;
             }
             const errorMessage = l10n.t('Unable to load schema from \'{0}\': {1}.', toDisplayString(url), message);
-            return new UnresolvedSchema({}, [toDiagnostic(errorMessage, errorCode)]);
+            return new UnresolvedSchema({}, [toDiagnostic(errorMessage, errorCode, url)]);
         });
     }
     resolveSchemaContent(schemaToResolve, handle) {
@@ -371,9 +376,10 @@ export class JSONSchemaService {
             return referencedHandle.getUnresolvedSchema().then(unresolvedSchema => {
                 parentHandle.dependencies.add(uri);
                 if (unresolvedSchema.errors.length) {
+                    const error = unresolvedSchema.errors[0];
                     const loc = refSegment ? uri + '#' + refSegment : uri;
-                    const errorMessage = l10n.t('Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0].message);
-                    resolveErrors.push(toDiagnostic(errorMessage, unresolvedSchema.errors[0].code));
+                    const errorMessage = refSegment ? l10n.t('Problems loading reference \'{0}\': {1}', refSegment, error.message) : error.message;
+                    resolveErrors.push(toDiagnostic(errorMessage, error.code, uri));
                 }
                 mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
                 return resolveRefs(node, unresolvedSchema.schema, referencedHandle);

package/lib/esm/services/jsonValidation.js

@@ -37,27 +37,28 @@ export class JSONValidation {
             let schemaValidation = documentSettings?.schemaValidation ? toDiagnosticSeverity(documentSettings.schemaValidation) : DiagnosticSeverity.Warning;
             let schemaRequest = documentSettings?.schemaRequest ? toDiagnosticSeverity(documentSettings.schemaRequest) : DiagnosticSeverity.Warning;
             if (schema) {
-                const addSchemaProblem = (errorMessage, errorCode) => {
+                const addSchemaProblem = (errorMessage, errorCode, relatedInformation) => {
                     if (jsonDocument.root && schemaRequest) {
                         const astRoot = jsonDocument.root;
                         const property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
                         if (property && property.keyNode.value === '$schema') {
                             const node = property.valueNode || property;
                             const range = Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode, 'json', relatedInformation));
                         }
                         else {
                             const range = Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                            addProblem(Diagnostic.create(range, errorMessage, schemaRequest, errorCode, 'json', relatedInformation));
                         }
                     }
                 };
                 if (schema.errors.length) {
-                    addSchemaProblem(schema.errors[0].message, schema.errors[0].code);
+                    const error = schema.errors[0];
+                    addSchemaProblem(error.message, error.code, error.relatedInformation);
                 }
                 else if (schemaValidation) {
                     for (const warning of schema.warnings) {
-                        addSchemaProblem(warning.message, warning.code);
+                        addSchemaProblem(warning.message, warning.code, warning.relatedInformation);
                     }
                     const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation, documentSettings?.schemaDraft);
                     if (semanticErrors) {

package/lib/umd/services/configuration.js

@@ -494,7 +494,7 @@
         maxProperties: l10n.t("The maximum number of properties an object can have. Inclusive."),
         minProperties: l10n.t("The minimum number of properties an object can have. Inclusive."),
         required: l10n.t("An array of strings that lists the names of all properties required on this object."),
-        additionalProperties: l10n.t("Either a schema or a boolean. If a schema, used to validate all properties not matched by 'properties', 'propertyNames', or 'patternProperties'. If false, any properties not defined by the adajacent keywords will cause this schema to fail."),
+        additionalProperties: l10n.t("Either a schema or a boolean. If a schema, used to validate all properties not matched by 'properties', 'propertyNames', or 'patternProperties'. If false, any properties not defined by the adjacent keywords will cause this schema to fail."),
         definitions: l10n.t("Not used for validation. Place subschemas here that you wish to reference inline with $ref."),
         properties: l10n.t("A map of property names to schemas for each property."),
         patternProperties: l10n.t("A map of regular expressions on property names to schemas for matching properties."),

package/lib/umd/services/jsonHover.js

@@ -108,7 +108,9 @@
             return plain
                 .trim()
                 .replace(/[\\`*_{}[\]()<>#+\-.!]/g, '\\$&') // escape markdown syntax tokens: http://daringfireball.net/projects/markdown/syntax#backslash
-                .replace(/([ \t]+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape spaces tabs
+                .replace(/(^ +)/mg, (_match, g1) => '&nbsp;'.repeat(g1.length)) // escape leading spaces on each line
+                .replace(/( {2,})/g, (_match, g1) => ' ' + '&nbsp;'.repeat(g1.length - 1)) // escape consecutive spaces
+                .replace(/(\t+)/g, (_match, g1) => '&nbsp;'.repeat(g1.length * 4)) // escape tabs
                 .replace(/\n/g, '\\\n'); // escape new lines
         }
         return undefined;

package/lib/umd/services/jsonSchemaService.js

@@ -8,7 +8,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "jsonc-parser", "vscode-uri", "../utils/strings", "../parser/jsonParser", "../jsonLanguageTypes", "@vscode/l10n", "../utils/glob", "../utils/objects"], factory);
+        define(["require", "exports", "jsonc-parser", "vscode-uri", "../utils/strings", "../parser/jsonParser", "../jsonLanguageTypes", "@vscode/l10n", "../utils/glob", "../utils/objects", "vscode-languageserver-types"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -22,6 +22,7 @@
     const l10n = require("@vscode/l10n");
     const glob_1 = require("../utils/glob");
     const objects_1 = require("../utils/objects");
+    const vscode_languageserver_types_1 = require("vscode-languageserver-types");
     const BANG = '!';
     const PATH_SEP = '/';
     class FilePatternAssociation {
@@ -115,8 +116,12 @@
         }
     }
     exports.UnresolvedSchema = UnresolvedSchema;
-    function toDiagnostic(message, code) {
-        return { message, code };
+    function toDiagnostic(message, code, relatedURL) {
+        const relatedInformation = relatedURL ? [{
+                location: { uri: relatedURL, range: vscode_languageserver_types_1.Range.create(0, 0, 0, 0) },
+                message
+            }] : undefined;
+        return { message, code, relatedInformation };
     }
     class ResolvedSchema {
         constructor(schema, errors = [], warnings = [], schemaDraft) {
@@ -279,23 +284,23 @@
         loadSchema(url) {
             if (!this.requestService) {
                 const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
-                return this.promise.resolve(new UnresolvedSchema({}, [toDiagnostic(errorMessage, jsonLanguageTypes_1.ErrorCode.SchemaResolveError)]));
+                return this.promise.resolve(new UnresolvedSchema({}, [toDiagnostic(errorMessage, jsonLanguageTypes_1.ErrorCode.SchemaResolveError, url)]));
             }
             return this.requestService(url).then(content => {
                 if (!content) {
                     const errorMessage = l10n.t('Unable to load schema from \'{0}\': No content.', toDisplayString(url));
-                    return new UnresolvedSchema({}, [toDiagnostic(errorMessage, jsonLanguageTypes_1.ErrorCode.SchemaResolveError)]);
+                    return new UnresolvedSchema({}, [toDiagnostic(errorMessage, jsonLanguageTypes_1.ErrorCode.SchemaResolveError, url)]);
                 }
                 const errors = [];
                 if (content.charCodeAt(0) === 65279) {
-                    errors.push(toDiagnostic(l10n.t('Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)), jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
+                    errors.push(toDiagnostic(l10n.t('Problem reading content from \'{0}\': UTF-8 with BOM detected, only UTF 8 is allowed.', toDisplayString(url)), jsonLanguageTypes_1.ErrorCode.SchemaResolveError, url));
                     content = content.trimStart();
                 }
                 let schemaContent = {};
                 const jsonErrors = [];
                 schemaContent = Json.parse(content, jsonErrors);
                 if (jsonErrors.length) {
-                    errors.push(toDiagnostic(l10n.t('Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset), jsonLanguageTypes_1.ErrorCode.SchemaResolveError));
+                    errors.push(toDiagnostic(l10n.t('Unable to parse content from \'{0}\': Parse error at offset {1}.', toDisplayString(url), jsonErrors[0].offset), jsonLanguageTypes_1.ErrorCode.SchemaResolveError, url));
                 }
                 return new UnresolvedSchema(schemaContent, errors);
             }, (error) => {
@@ -317,7 +322,7 @@
                     errorCode += code;
                 }
                 const errorMessage = l10n.t('Unable to load schema from \'{0}\': {1}.', toDisplayString(url), message);
-                return new UnresolvedSchema({}, [toDiagnostic(errorMessage, errorCode)]);
+                return new UnresolvedSchema({}, [toDiagnostic(errorMessage, errorCode, url)]);
             });
         }
         resolveSchemaContent(schemaToResolve, handle) {
@@ -385,9 +390,10 @@
                 return referencedHandle.getUnresolvedSchema().then(unresolvedSchema => {
                     parentHandle.dependencies.add(uri);
                     if (unresolvedSchema.errors.length) {
+                        const error = unresolvedSchema.errors[0];
                         const loc = refSegment ? uri + '#' + refSegment : uri;
-                        const errorMessage = l10n.t('Problems loading reference \'{0}\': {1}', loc, unresolvedSchema.errors[0].message);
-                        resolveErrors.push(toDiagnostic(errorMessage, unresolvedSchema.errors[0].code));
+                        const errorMessage = refSegment ? l10n.t('Problems loading reference \'{0}\': {1}', refSegment, error.message) : error.message;
+                        resolveErrors.push(toDiagnostic(errorMessage, error.code, uri));
                     }
                     mergeRef(node, unresolvedSchema.schema, referencedHandle, refSegment);
                     return resolveRefs(node, unresolvedSchema.schema, referencedHandle);

package/lib/umd/services/jsonValidation.js

@@ -49,27 +49,28 @@
                 let schemaValidation = documentSettings?.schemaValidation ? toDiagnosticSeverity(documentSettings.schemaValidation) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
                 let schemaRequest = documentSettings?.schemaRequest ? toDiagnosticSeverity(documentSettings.schemaRequest) : jsonLanguageTypes_1.DiagnosticSeverity.Warning;
                 if (schema) {
-                    const addSchemaProblem = (errorMessage, errorCode) => {
+                    const addSchemaProblem = (errorMessage, errorCode, relatedInformation) => {
                         if (jsonDocument.root && schemaRequest) {
                             const astRoot = jsonDocument.root;
                             const property = astRoot.type === 'object' ? astRoot.properties[0] : undefined;
                             if (property && property.keyNode.value === '$schema') {
                                 const node = property.valueNode || property;
                                 const range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(node.offset), textDocument.positionAt(node.offset + node.length));
-                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode, 'json', relatedInformation));
                             }
                             else {
                                 const range = jsonLanguageTypes_1.Range.create(textDocument.positionAt(astRoot.offset), textDocument.positionAt(astRoot.offset + 1));
-                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode));
+                                addProblem(jsonLanguageTypes_1.Diagnostic.create(range, errorMessage, schemaRequest, errorCode, 'json', relatedInformation));
                             }
                         }
                     };
                     if (schema.errors.length) {
-                        addSchemaProblem(schema.errors[0].message, schema.errors[0].code);
+                        const error = schema.errors[0];
+                        addSchemaProblem(error.message, error.code, error.relatedInformation);
                     }
                     else if (schemaValidation) {
                         for (const warning of schema.warnings) {
-                            addSchemaProblem(warning.message, warning.code);
+                            addSchemaProblem(warning.message, warning.code, warning.relatedInformation);
                         }
                         const semanticErrors = jsonDocument.validate(textDocument, schema.schema, schemaValidation, documentSettings?.schemaDraft);
                         if (semanticErrors) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.7.0",
+  "version": "5.7.2",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",
@@ -17,12 +17,12 @@
   "devDependencies": {
     "@types/mocha": "^10.0.10",
     "@types/node": "22.x",
-    "@typescript-eslint/eslint-plugin": "^8.53.0",
-    "@typescript-eslint/parser": "^8.53.0",
-    "eslint": "^9.39.2",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
+    "eslint": "^9.39.3",
     "json-schema-test-suite": "https://github.com/json-schema-org/JSON-Schema-Test-Suite.git#69acf52990b004240839ae19b4bec8fb01d50876",
     "mocha": "^11.7.5",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.1.3",
     "typescript": "^5.9.3"
   },
   "dependencies": {