From 2f06141c30657cd8e68fa9f74178e6030401eac3 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Mon, 7 Sep 2020 15:56:34 +0200
Subject: [PATCH] update to latest JSON language service

---
 monaco.d.ts       |  2 ++
 package-lock.json | 46 +++++++++++++++++++++++-----------------------
 package.json      |  6 +++---
 scripts/dts.js    |  2 ++
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/monaco.d.ts b/monaco.d.ts
index 664598f7..79457790 100644
--- a/monaco.d.ts
+++ b/monaco.d.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/// <reference path="node_modules/monaco-editor-core/monaco.d.ts" />
+
 declare namespace monaco.languages.json {
 	export interface DiagnosticsOptions {
 		/**
diff --git a/package-lock.json b/package-lock.json
index 2e583ad0..a091da83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -157,9 +157,9 @@
 			"dev": true
 		},
 		"chalk": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+			"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 			"dev": true,
 			"requires": {
 				"ansi-styles": "^4.1.0",
@@ -326,18 +326,6 @@
 				"please-upgrade-node": "^3.2.0",
 				"slash": "^3.0.0",
 				"which-pm-runs": "^1.0.0"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				}
 			}
 		},
 		"ignore": {
@@ -608,6 +596,18 @@
 				"ignore": "^5.1.4",
 				"mri": "^1.1.5",
 				"multimatch": "^4.0.0"
+			},
+			"dependencies": {
+				"chalk": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
+					}
+				}
 			}
 		},
 		"pump": {
@@ -720,16 +720,16 @@
 			"dev": true
 		},
 		"vscode-json-languageservice": {
-			"version": "3.4.11",
-			"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.11.tgz",
-			"integrity": "sha512-26Qv1SFp6x3XmCqU1BRceRsSKRO3xkQa6/K8ziSRt52/LQPiw5ipSxlGVSlzIoi5LCmQVEqUajhiVEMNlFXhNw==",
+			"version": "3.8.3",
+			"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz",
+			"integrity": "sha512-8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ==",
 			"dev": true,
 			"requires": {
-				"jsonc-parser": "^2.2.0",
-				"vscode-languageserver-textdocument": "^1.0.0-next.5",
-				"vscode-languageserver-types": "^3.15.0-next.9",
-				"vscode-nls": "^4.1.1",
-				"vscode-uri": "^2.1.1"
+				"jsonc-parser": "^2.2.1",
+				"vscode-languageserver-textdocument": "^1.0.1",
+				"vscode-languageserver-types": "^3.15.1",
+				"vscode-nls": "^4.1.2",
+				"vscode-uri": "^2.1.2"
 			}
 		},
 		"vscode-languageserver-textdocument": {
diff --git a/package.json b/package.json
index 6e5c2a15..5085ca8e 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
 	"module": "./release/esm/monaco.contribution.js",
 	"typings": "./release/esm/monaco.contribution.d.ts",
 	"devDependencies": {
-		"husky": "^4.2.5",
-		"jsonc-parser": "^2.2.0",
+		"husky": "^4.3.0",
+		"jsonc-parser": "^2.3.0",
 		"monaco-editor-core": "0.20.0",
 		"monaco-languages": "1.10.0",
 		"monaco-plugin-helpers": "^1.0.3",
@@ -32,7 +32,7 @@
 		"requirejs": "^2.3.6",
 		"typescript": "4.0.2",
 		"terser": "^5.3.0",
-		"vscode-json-languageservice": "3.4.11"
+		"vscode-json-languageservice": "3.8.3"
 	},
 	"husky": {
 		"hooks": {
diff --git a/scripts/dts.js b/scripts/dts.js
index 1d9977db..d7dd87ce 100644
--- a/scripts/dts.js
+++ b/scripts/dts.js
@@ -20,6 +20,8 @@ let result = [
 	` *  Licensed under the MIT License. See License.txt in the project root for license information.`,
 	` *--------------------------------------------------------------------------------------------*/`,
 	``,
+	`/// <reference path="node_modules/monaco-editor-core/monaco.d.ts" />`,
+	``,
 	`declare namespace monaco.languages.json {`
 ];
 for (let line of lines) {