Avoid NPE when annotation.getText() == null

Fixes eclipse-platform#173
mickaelistria · Mar 29, 2023 · b9355a2 · b9355a2
1 parent b8b0ff5
commit b9355a2
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...rg/eclipse/ui/internal/editors/text/codemining/annotation/AnnotationCodeMiningFilter.java b/...rg/eclipse/ui/internal/editors/text/codemining/annotation/AnnotationCodeMiningFilter.java
@@ -25,16 +25,13 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-
-import org.eclipse.core.resources.IMarker;
-
 import org.eclipse.jface.text.quickassist.IQuickFixableAnnotation;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.IAnnotationAccessExtension;
 import org.eclipse.jface.text.source.IAnnotationPresentation;
-
 import org.eclipse.ui.texteditor.MarkerAnnotation;
 
 /**
@@ -149,7 +146,7 @@ private Stream<Annotation> sort(Locator locator, Stream<Annotation> anns) {
 				return resultSeverity;
 			}
 
-			return a.getText().compareTo(b.getText());
+			return a.getText() == null ? (b.getText() == null ? 0 : -1) : (b.getText() == null ? 1 : a.getText().compareTo(a.getText()));
 		});
 	}