Adopt latest monaco-editor-core & other deps

package-lock.json

@@ -17,15 +17,15 @@
       "dev": true
     },
     "monaco-editor-core": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.19.0.tgz",
-      "integrity": "sha512-wD60zpYDhsuJbzzLQigAteK2cA5fkuaDn+4c7NLwm/526OX5eL6MMvLhfvRgrDvLO00SYhFf6vz1y1C8M1hTpQ==",
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz",
+      "integrity": "sha512-4mdmfEejTvRZzrEIn70jqqNl3g15vnkRdTkJ8uMK4jiljntlwhiSc5vknZOLt1QM8za16C3tDrSl2mTL9ma2Sg==",
       "dev": true
     },
     "monaco-languages": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.9.0.tgz",
-      "integrity": "sha512-FAP2tF4Kwz5xYEBO3iSoyYAFjnk6IpW9YSMjnkNIR8bqb21uT7pZFSRu3j1MdoG0c+P/LdQH/VSHSXBTI5wdbw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.10.0.tgz",
+      "integrity": "sha512-ARAws17Xh0K4WsZYkJY6CqHn9EYdYN8CjzK6w/jgXIwU0owzCdUWxzu+FNJ/LeDLcKxL/YK3phcwGFj9IqX2yw==",
       "dev": true
     },
     "monaco-plugin-helpers": {
@@ -68,9 +68,9 @@
       }
     },
     "terser": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz",
-      "integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==",
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
+      "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -79,9 +79,9 @@
       }
     },
     "typescript": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz",
-      "integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==",
+      "version": "3.7.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
+      "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
       "dev": true
     },
     "vscode-html-languageservice": {

package.json

@@ -19,12 +19,12 @@
     "url": "https://github.com/Microsoft/monaco-editor/issues"
   },
   "devDependencies": {
-    "monaco-editor-core": "0.19.0",
-    "monaco-languages": "^1.9.0",
+    "monaco-editor-core": "0.20.0",
+    "monaco-languages": "^1.10.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",
-    "typescript": "^3.7.3",
-    "terser": "^4.4.3",
+    "typescript": "^3.7.5",
+    "terser": "^4.6.3",
     "vscode-html-languageservice": "3.0.4-next.12",
     "vscode-languageserver-types": "3.15.0-next.9",
     "vscode-languageserver-textdocument": "^1.0.0-next.5"

src/languageFeatures.ts

@@ -498,16 +498,18 @@ function toWorkspaceEdit(edit: htmlService.WorkspaceEdit): monaco.languages.Work
 	if (!edit || !edit.changes) {
 		return void 0;
 	}
-	let resourceEdits: monaco.languages.ResourceTextEdit[] = [];
+	let resourceEdits: monaco.languages.WorkspaceTextEdit[] = [];
 	for (let uri in edit.changes) {
-		let edits: monaco.languages.TextEdit[] = [];
+		const _uri = Uri.parse(uri);
 		for (let e of edit.changes[uri]) {
-			edits.push({
-				range: toRange(e.range),
-				text: e.newText
+			resourceEdits.push({
+				resource: _uri,
+				edit: {
+					range: toRange(e.range),
+					text: e.newText
+				}
 			});
 		}
-		resourceEdits.push({ resource: Uri.parse(uri), edits: edits });
 	}
 	return {
 		edits: resourceEdits
@@ -572,4 +574,4 @@ export class SelectionRangeAdapter implements monaco.languages.SelectionRangePro
 		});
 	}
 
-}
+}