improve related item popup display

Author: hauner

src/main/kotlin/io/openapiprocessor/intellij/GotoGroup.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 https://github.com/openapi-processor/openapi-processor-intellij
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.intellij
+
+import com.intellij.navigation.GotoRelatedItem
+import com.intellij.psi.PsiElement
+import com.intellij.psi.presentation.java.SymbolPresentationUtil.getSymbolContainerText
+import com.intellij.psi.presentation.java.SymbolPresentationUtil.getSymbolPresentableText
+
+
+class GotoMethod(element: PsiElement): GotoRelatedItem(element, Goto.I18n.GROUP) {
+    override fun getCustomName(): String {
+        return getSymbolPresentableText(this.element!!)
+    }
+
+    override fun getCustomContainerName(): String {
+        return getSymbolContainerText(this.element!!)!!
+    }
+}
+
+object Goto {
+    object I18n {
+        val GROUP = i18n("goto.related.item.group")
+    }
+}

src/main/kotlin/io/openapiprocessor/intellij/OpenApiPathLineMarker.kt

@@ -11,6 +11,7 @@ import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.components.service
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMethod
 import com.intellij.util.IconUtil
 import org.jetbrains.yaml.psi.YAMLKeyValue
 import org.slf4j.Logger
@@ -23,7 +24,6 @@ class OpenApiPathLineMarker: RelatedItemLineMarkerProvider()  {
         element: PsiElement,
         result: MutableCollection<in RelatedItemLineMarkerInfo<*>>
     ) {
-
         if (element !is YAMLKeyValue)
             return
 
@@ -39,25 +39,25 @@ class OpenApiPathLineMarker: RelatedItemLineMarkerProvider()  {
             if (path !is YAMLKeyValue)
                 return@forEach
 
-            val isPath = path.keyText.startsWith("/")
+            val keyText = path.keyText
+            val isPath = keyText.startsWith("/")
             if (!isPath) {
-                log.warn("expected to find path but found {}", path.keyText)
+                log.warn("expected to find path but found {}", keyText)
             }
 
             val targets = pathTargetService.findPathTargets(path.project, path.keyText)
 
-            if (targets.isEmpty()) {
-                log.warn("found no targets!")
-                return@forEach
-            }
-
-            val builder = NavigationGutterIconBuilder
-                .create(icon)
+            val markerInfo = NavigationGutterIconBuilder
+                .create<PsiMethod>(
+                    icon,
+                    { listOf(it) },
+                    { listOf(GotoMethod(it)) })
                 .setTooltipText(I18n.TOOLTIP_TEXT)
                 .setPopupTitle(I18n.POPUP_TITLE)
                 .setTargets(targets)
+                .createLineMarkerInfo(path.key!!)
 
-            result.add(builder.createLineMarkerInfo(path.key!!))
+            result.add(markerInfo)
         }
     }
 

src/main/kotlin/io/openapiprocessor/intellij/PathTargetService.kt

@@ -8,7 +8,6 @@ package io.openapiprocessor.intellij
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiAnnotation
-import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.impl.java.stubs.index.JavaAnnotationIndex
 import com.intellij.psi.search.GlobalSearchScope
@@ -17,22 +16,22 @@ import com.intellij.psi.util.PsiTreeUtil
 @Service
 class PathTargetService {
 
-    fun findPathTargets(project: Project, path: String): List<PsiElement> {
+    fun findPathTargets(project: Project, path: String): List<PsiMethod> {
         return Annotations.KNOWN
             .map { findPathTargets(project, path, it) }
             .flatten()
     }
 
-    private fun findPathTargets(project: Project, path: String, annotation: Annotation): List<PsiElement> {
-        val targets = mutableListOf<PsiElement>()
+    private fun findPathTargets(project: Project, path: String, annotation: Annotation): List<PsiMethod> {
+        val targets = mutableListOf<PsiMethod>()
         val matches = getAnnotations(project, annotation)
 
         matches
             .filter { annotation.matches(it, path) }
             .forEach {
                 val method = PsiTreeUtil.getParentOfType(it.navigationElement, PsiMethod::class.java)
                 if (method != null)
-                    targets.add(method.navigationElement)
+                    targets.add(method)
             }
 
         return targets

src/main/kotlin/io/openapiprocessor/intellij/TypeMappingPackageLineMarker.kt

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory
 import javax.swing.Icon as JIcon
 
 /**
- * line marker for the package-name key in the mapping.yaml. It navigates to any folder with the same package name.
+ * Line marker for the package-name key in the mapping.yaml. It navigates to any folder with the same package name.
  */
 class TypeMappingPackageLineMarker : RelatedItemLineMarkerProvider() {
     private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
@@ -74,7 +74,7 @@ class TypeMappingPackageLineMarker : RelatedItemLineMarkerProvider() {
         }
     }
 
-    class GotoPackage(element: PsiDirectory): GotoRelatedItem(element, I18n.GOTO_GROUP) {
+    class GotoPackage(element: PsiDirectory): GotoRelatedItem(element, Goto.I18n.GROUP) {
         override fun getCustomName(): String {
             return "${getSymbolPresentableText(this.element!!)}"
         }
@@ -185,7 +185,6 @@ class TypeMappingPackageLineMarker : RelatedItemLineMarkerProvider() {
     object I18n {
         val TOOLTIP_TEXT = i18n("line.marker.type.mapping.package.tooltip")
         val POPUP_TITLE = i18n("line.marker.type.mapping.package.title")
-        val GOTO_GROUP = i18n("goto.related.item.group")
     }
 
     companion object {

src/main/kotlin/io/openapiprocessor/intellij/TypeMappingPathLineMarker.kt

@@ -12,6 +12,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.components.service
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiMethod
 import com.intellij.util.IconUtil
 import org.jetbrains.yaml.psi.YAMLKeyValue
 import org.slf4j.Logger
@@ -54,7 +55,10 @@ class TypeMappingPathLineMarker : RelatedItemLineMarkerProvider() {
         }
 
         val builder = NavigationGutterIconBuilder
-            .create(Icon.`interface`)
+            .create<PsiMethod>(
+                Icon.`interface`,
+                { listOf(it) },
+                { listOf(GotoMethod(it)) })
             .setTooltipText(I18n.TOOLTIP_TEXT)
             .setPopupTitle(I18n.POPUP_TITLE)
             .setTargets(targets)