From f1754a3b261f92ca906a4a3a7fb81474254e24b3 Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 23 Dec 2020 14:32:45 +0100 Subject: [PATCH] Fix potential NPE --- src/languageFeatures.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/languageFeatures.ts b/src/languageFeatures.ts index 743333de..15598e9a 100644 --- a/src/languageFeatures.ts +++ b/src/languageFeatures.ts @@ -104,7 +104,10 @@ export class DiagnosticsAdapter { .then((worker) => { return worker.doValidation(resource.toString()).then((diagnostics) => { const markers = diagnostics.map((d) => toDiagnostics(resource, d)); - editor.setModelMarkers(editor.getModel(resource), languageId, markers); + const model = editor.getModel(resource); + if (model && model.getModeId() === languageId) { + editor.setModelMarkers(model, languageId, markers); + } }); }) .then(undefined, (err) => {