From b6b35ea42d33a2c66dfb6a731bec40f4870d2f41 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 27 Feb 2017 10:46:37 +0100 Subject: [PATCH] [json] support patternErrorMessage for #21384 --- extensions/json/server/npm-shrinkwrap.json | 4 ++-- extensions/json/server/package.json | 2 +- src/vs/base/common/jsonSchema.ts | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/json/server/npm-shrinkwrap.json b/extensions/json/server/npm-shrinkwrap.json index da7cd92a7a1..e832646170b 100644 --- a/extensions/json/server/npm-shrinkwrap.json +++ b/extensions/json/server/npm-shrinkwrap.json @@ -43,9 +43,9 @@ "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.0.tgz" }, "vscode-json-languageservice": { - "version": "2.0.3", + "version": "2.0.4", "from": "vscode-json-languageservice@next", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.3.tgz" + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-2.0.4.tgz" }, "vscode-jsonrpc": { "version": "3.1.0-alpha.1", diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index 72e0e2e85ac..e3c34d83f39 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -10,7 +10,7 @@ "dependencies": { "jsonc-parser": "^0.4.0", "request-light": "^0.2.0", - "vscode-json-languageservice": "^2.0.3", + "vscode-json-languageservice": "^2.0.4", "vscode-languageserver": "^3.1.0-alpha.1", "vscode-nls": "^2.0.2" }, diff --git a/src/vs/base/common/jsonSchema.ts b/src/vs/base/common/jsonSchema.ts index c09e2060811..1405eee19a5 100644 --- a/src/vs/base/common/jsonSchema.ts +++ b/src/vs/base/common/jsonSchema.ts @@ -42,6 +42,7 @@ export interface IJSONSchema { defaultSnippets?: IJSONSchemaSnippet[]; // VSCode extension errorMessage?: string; // VSCode extension + patternErrorMessage?: string; // VSCode extension deprecationMessage?: string; // VSCode extension enumDescriptions?: string[]; // VSCode extension }