From b80471a6bf2a9c3e0dc4f187f5823fe88120e16c Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 12 May 2021 18:26:01 +0200
Subject: [PATCH] add DiagnosticsOptions.comments and
 DiagnosticsOptions.trailingCommas

---
 package.json               |  4 ++--
 src/monaco.contribution.ts | 21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ba8f68fe..bec3b5da 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
 		"pretty-quick": "^3.1.0",
 		"requirejs": "^2.3.6",
 		"terser": "^5.6.0",
-		"typescript": "4.2.3",
-		"vscode-json-languageservice": "4.0.2",
+		"typescript": "4.2.4",
+		"vscode-json-languageservice": "4.1.4",
 		"vscode-uri": "3.0.2"
 	},
 	"husky": {
diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index 5a15ba31..fe70cb3c 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -10,11 +10,13 @@ import { Emitter, IEvent, languages } from './fillers/monaco-editor-core';
 
 export interface DiagnosticsOptions {
 	/**
-	 * If set, the validator will be enabled and perform syntax validation as well as schema based validation.
+	 * If set, the validator will be enabled and perform syntax and validation schema based validation,
+	 * unless `DiagnosticsOptions.schemaValidation` is set to `ignore`.
 	 */
 	readonly validate?: boolean;
 	/**
 	 * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments.
+	 * `DiagnosticsOptions.allowComments` will override this setting.
 	 */
 	readonly allowComments?: boolean;
 	/**
@@ -26,7 +28,10 @@ export interface DiagnosticsOptions {
 		 */
 		readonly 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 glob patterns that describe for which file URIs the JSON schema will be used.
+		 * '*' and '**' wildcards are supported. Exclusion patterns start with '!'.
+		 * For example '*.schema.json', 'package.json', '!foo*.schema.json', 'foo/**\/BADRESP.json'.
+		 * A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'.
 		 */
 		readonly fileMatch?: string[];
 		/**
@@ -46,6 +51,14 @@ export interface DiagnosticsOptions {
 	 * 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.
 	 */
 	readonly schemaRequest?: SeverityLevel;
+	/**
+	 * The severity of reported trailing commas. If not set, trailing commas will be reported as errors.
+	 */
+	readonly trailingCommas?: SeverityLevel;
+	/**
+	 * The severity of reported comments. If not set, 'DiagnosticsOptions.allowComments' defines whether comments are ignored or reported as errors.
+	 */
+	readonly comments?: SeverityLevel;
 }
 
 export declare type SeverityLevel = 'error' | 'warning' | 'ignore';
@@ -160,7 +173,9 @@ const diagnosticDefault: Required<DiagnosticsOptions> = {
 	schemas: [],
 	enableSchemaRequest: false,
 	schemaRequest: 'warning',
-	schemaValidation: 'warning'
+	schemaValidation: 'warning',
+	comments: 'error',
+	trailingCommas: 'error'
 };
 
 const modeConfigurationDefault: Required<ModeConfiguration> = {