Fix various occasions where invalid PsiElements could be shown in line marker popups by filtering on validity

Author: CodeDrivenMitch

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Fixed
 - [#59] Fixed ClassCastException during querying provider ClassLineMarkerProvider (thanks @kaleev for reporting the error)
+- Fix various occasions where invalid PsiElements could be shown in line marker popups by filtering on validity
 
 ## [0.6.1]
 

src/main/kotlin/org/axonframework/intellij/ide/plugin/markers/AxonNavigationGutterIconRenderer.kt

@@ -62,7 +62,7 @@ class AxonNavigationGutterIconRenderer(
 
     override fun navigateToItems(event: MouseEvent?) {
         if (event != null) {
-            val elements = PsiUtilCore.toPsiElementArray(targetElements)
+            val elements = PsiUtilCore.toPsiElementArray(targetElements.filter { it.isValid })
             val popup = NavigationUtil.getPsiElementPopup(elements, myCellRenderer.compute(), myPopupTitle)
             popup.show(RelativePoint(event))
         }
@@ -76,7 +76,11 @@ class AxonNavigationGutterIconRenderer(
             { tooltipText },
             this,
             alignment,
-            { elements.value.map { WrappedGoToRelatedItem(it) } }
+            {
+                elements.value
+                    .filter { it.element.isValid }
+                    .map { WrappedGoToRelatedItem(it) }
+            }
         )
     }
 }