Exceptions when trying to remove a registered JSON schema and disposi…

…ng a model. Fixes microsoft/monaco-editor#1254
microsoft · Mar 18, 2019 · 40c2b11 · 40c2b11
1 parent d9372e4
commit 40c2b11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "jsonc-parser": "^2.0.3",
-    "monaco-editor-core": "0.16.0",
+    "monaco-editor-core": "0.16.1",
     "monaco-languages": "1.7.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",

diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts
@@ -103,7 +103,7 @@ export class DiagnosticsAdapter {
 			return worker.doValidation(resource.toString()).then(diagnostics => {
 				const markers = diagnostics.map(d => toDiagnostics(resource, d));
 				let model = monaco.editor.getModel(resource);
-				if (model.getModeId() === languageId) {
+				if (model && model.getModeId() === languageId) {
 					monaco.editor.setModelMarkers(model, languageId, markers);
 				}
 			});