From 69dfecdbe4f9393c5d090bcf0f46a019a61b2cde Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 28 Jan 2016 17:25:35 +0100 Subject: [PATCH] Allow custom error messages for regex issues --- extensions/json/server/src/json-toolbox/jsonSchema.ts | 2 ++ extensions/json/server/src/jsonParser.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/json/server/src/json-toolbox/jsonSchema.ts b/extensions/json/server/src/json-toolbox/jsonSchema.ts index 4255abb9a4b..25d2902f4d1 100644 --- a/extensions/json/server/src/json-toolbox/jsonSchema.ts +++ b/extensions/json/server/src/json-toolbox/jsonSchema.ts @@ -39,6 +39,8 @@ export interface IJSONSchema { not?:IJSONSchema; enum?:any[]; format?: string; + + errorMessage?:string; // VS code internal } export interface IJSONSchemaMap { diff --git a/extensions/json/server/src/jsonParser.ts b/extensions/json/server/src/jsonParser.ts index eec576cd312..3aa2015c86b 100644 --- a/extensions/json/server/src/jsonParser.ts +++ b/extensions/json/server/src/jsonParser.ts @@ -452,7 +452,7 @@ export class StringASTNode extends ASTNode { if (!regex.test(this.value)) { validationResult.warnings.push({ location: { start: this.start, end: this.end }, - message: nls.localize('patternWarning', 'String does not match the pattern of "{0}"', schema.pattern) + message: schema.errorMessage || nls.localize('patternWarning', 'String does not match the pattern of "{0}"', schema.pattern) }); } }