From 2bece31f5689035bed1808fabc38fb776d6586fb Mon Sep 17 00:00:00 2001 From: Patrick Shipe Date: Wed, 15 Sep 2021 08:59:40 -0600 Subject: [PATCH] Fix crashes from null model --- src/languageFeatures.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 4e19cf7..349ae49 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -62,7 +62,9 @@ export function createDiagnosticsAdapter( const diagnostics = await worker.doValidation(String(resource)); const markers = diagnostics.map(toDiagnostics); const model = editor.getModel(resource); - if (model.getModeId() === languageId) { + // Return value from getModel can be null if model not found + // (e.g. if user navigates away from editor) + if (model && model.getModeId() === languageId) { editor.setModelMarkers(model, languageId, markers); } };