Browse Source

Fix potential NPE

Alexandru Dima 4 years ago
parent
commit
f1754a3b26
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/languageFeatures.ts

+ 4 - 1
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) => {