From 16be459ed00b582d4692fa553f96759efb62988e Mon Sep 17 00:00:00 2001 From: Mickael Istria Date: Wed, 17 Nov 2021 18:02:59 +0100 Subject: [PATCH] Issue #3 - Avoid error in compare editor --- .../linkedediting/LSPLinkedEditingReconcilingStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/linkedediting/LSPLinkedEditingReconcilingStrategy.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/linkedediting/LSPLinkedEditingReconcilingStrategy.java index bebe9e9e4..a6f1f1d3b 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/linkedediting/LSPLinkedEditingReconcilingStrategy.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/linkedediting/LSPLinkedEditingReconcilingStrategy.java @@ -208,7 +208,7 @@ private void updateLinkedEditingHighlights() { * a progress monitor */ private void updateLinkedEditingAnnotations(IAnnotationModel annotationModel, IProgressMonitor monitor) { - if (monitor.isCanceled()) { + if (monitor.isCanceled() || annotationModel == null) { return; }