Adopt latest monaco-editor-core

This commit is contained in:
Alex Dima 2020-02-10 23:45:54 +01:00
parent 5b08a3733e
commit 1bab4e14fe
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0
3 changed files with 31 additions and 30 deletions

38
package-lock.json generated
View file

@ -10,16 +10,22 @@
"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"dev": true "dev": true
}, },
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
"monaco-editor-core": { "monaco-editor-core": {
"version": "0.19.0", "version": "0.20.0",
"resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.19.0.tgz", "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz",
"integrity": "sha512-wD60zpYDhsuJbzzLQigAteK2cA5fkuaDn+4c7NLwm/526OX5eL6MMvLhfvRgrDvLO00SYhFf6vz1y1C8M1hTpQ==", "integrity": "sha512-4mdmfEejTvRZzrEIn70jqqNl3g15vnkRdTkJ8uMK4jiljntlwhiSc5vknZOLt1QM8za16C3tDrSl2mTL9ma2Sg==",
"dev": true "dev": true
}, },
"monaco-languages": { "monaco-languages": {
"version": "1.9.0", "version": "1.10.0",
"resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.9.0.tgz", "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-1.10.0.tgz",
"integrity": "sha512-FAP2tF4Kwz5xYEBO3iSoyYAFjnk6IpW9YSMjnkNIR8bqb21uT7pZFSRu3j1MdoG0c+P/LdQH/VSHSXBTI5wdbw==", "integrity": "sha512-ARAws17Xh0K4WsZYkJY6CqHn9EYdYN8CjzK6w/jgXIwU0owzCdUWxzu+FNJ/LeDLcKxL/YK3phcwGFj9IqX2yw==",
"dev": true "dev": true
}, },
"monaco-plugin-helpers": { "monaco-plugin-helpers": {
@ -62,28 +68,20 @@
} }
}, },
"terser": { "terser": {
"version": "4.4.3", "version": "4.6.3",
"resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz",
"integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==", "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
"source-map": "~0.6.1", "source-map": "~0.6.1",
"source-map-support": "~0.5.12" "source-map-support": "~0.5.12"
},
"dependencies": {
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
}
} }
}, },
"typescript": { "typescript": {
"version": "3.7.3", "version": "3.7.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz",
"integrity": "sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==", "integrity": "sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==",
"dev": true "dev": true
}, },
"vscode-css-languageservice": { "vscode-css-languageservice": {

View file

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

View file

@ -393,16 +393,19 @@ function toWorkspaceEdit(edit: cssService.WorkspaceEdit): monaco.languages.Works
if (!edit || !edit.changes) { if (!edit || !edit.changes) {
return void 0; return void 0;
} }
let resourceEdits: monaco.languages.ResourceTextEdit[] = []; let resourceEdits: monaco.languages.WorkspaceTextEdit[] = [];
for (let uri in edit.changes) { for (let uri in edit.changes) {
let edits: monaco.languages.TextEdit[] = []; const _uri = Uri.parse(uri);
// let edits: monaco.languages.TextEdit[] = [];
for (let e of edit.changes[uri]) { for (let e of edit.changes[uri]) {
edits.push({ resourceEdits.push({
resource: _uri,
edit: {
range: toRange(e.range), range: toRange(e.range),
text: e.newText text: e.newText
}
}); });
} }
resourceEdits.push({ resource: Uri.parse(uri), edits: edits });
} }
return { return {
edits: resourceEdits edits: resourceEdits