diff --git a/package-lock.json b/package-lock.json index cc5a6bb6..fca2be77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -219,15 +219,15 @@ } }, "monaco-editor-core": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.28.1.tgz", - "integrity": "sha512-ikNy6KXmgKhV66W7xLkdECJLAAzDycUe6rhXbdmUaa6L23X70Y0jOaCj/W9gqAo4wUT3MpRmeKEgujNKKH9p8A==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.30.0.tgz", + "integrity": "sha512-vFJ7BEOCqLv4xWgFW+UheI/PtccHHNht29lNmo79Re1kNhWCBLLb2nThjRMLPO1rd41vX9hhd9C07/iKOk9/jQ==", "dev": true }, "monaco-languages": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.4.0.tgz", - "integrity": "sha512-63ZMAPgqBylS0kyC22QSKJWJmCRcwM7dWql1xtt9R7mCfzszfIIViSTiJ5vDSnzj0lH0aZh8OJggh/uZY6Vgnw==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/monaco-languages/-/monaco-languages-2.11.0.tgz", + "integrity": "sha512-fpeP8XUPejcdoUEMZ5bo4MW8VzEadhrsuyDtT48p2a2PSRT/CXptQm4eGnIfgxf5R95jrCZ0456c5dSEPBuktA==", "dev": true }, "monaco-plugin-helpers": { @@ -443,9 +443,9 @@ "dev": true }, "vscode-css-languageservice": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.5.tgz", - "integrity": "sha512-c1hhsbnZ7bBvj10vMDLmkOk/n9r0rXQYDj4kbBi59bZaaEZ3e81zURx76/618NZM5NytlZmGfvmxQtB7mb03Ow==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.8.tgz", + "integrity": "sha512-Si1sMykS8U/p8LYgLGPCfZD1YFT0AtvUJQp9XJGw64DZWhtwYo28G2l64USLS9ge4ZPMZpwdpOK7PfbVKfgiiA==", "dev": true, "requires": { "vscode-languageserver-textdocument": "^1.0.1", @@ -455,9 +455,9 @@ } }, "vscode-languageserver-textdocument": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz", - "integrity": "sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.2.tgz", + "integrity": "sha512-T7uPC18+f8mYE4lbVZwb3OSmvwTZm3cuFhrdx9Bn2l11lmp3SvSuSVjy2JtvrghzjAo4G6Trqny2m9XGnFnWVA==", "dev": true }, "vscode-languageserver-types": { diff --git a/package.json b/package.json index bd78db46..3ffd0b7f 100644 --- a/package.json +++ b/package.json @@ -23,17 +23,17 @@ "typings": "./release/esm/monaco.contribution.d.ts", "devDependencies": { "husky": "^5.1.3", - "monaco-editor-core": "0.28.1", - "monaco-languages": "2.4.0", + "monaco-editor-core": "0.30.0", + "monaco-languages": "2.11.0", "monaco-plugin-helpers": "^1.0.3", "prettier": "^2.2.1", "pretty-quick": "^3.1.0", "requirejs": "^2.3.6", "typescript": "4.3.2", "terser": "^5.7.0", - "vscode-css-languageservice": "^5.1.5", + "vscode-css-languageservice": "^5.1.8", "vscode-languageserver-types": "3.16.0", - "vscode-languageserver-textdocument": "^1.0.1" + "vscode-languageserver-textdocument": "^1.0.2" }, "husky": { "hooks": { diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index fbb776b3..3e998317 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -37,7 +37,7 @@ export class DiagnosticsAdapter { defaults: LanguageServiceDefaults ) { const onModelAdd = (model: editor.IModel): void => { - let modeId = model.getModeId(); + let modeId = model.getLanguageId(); if (modeId !== this._languageId) { return; } @@ -73,7 +73,7 @@ export class DiagnosticsAdapter { defaults.onDidChange((_) => { editor.getModels().forEach((model) => { - if (model.getModeId() === this._languageId) { + if (model.getLanguageId() === this._languageId) { onModelRemoved(model); onModelAdd(model); } @@ -104,7 +104,7 @@ export class DiagnosticsAdapter { .then((diagnostics) => { const markers = diagnostics.map((d) => toDiagnostics(resource, d)); let model = editor.getModel(resource); - if (model && model.getModeId() === languageId) { + if (model && model.getLanguageId() === languageId) { editor.setModelMarkers(model, languageId, markers); } })