Supporting subscribe for Enum when statically imported #10

Madrapps · Aug 22, 2019 · 3441cd2 · 3441cd2
1 parent b7ff2e4
commit 3441cd2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,9 +34,10 @@ compileTestKotlin {
 
 patchPluginXml {
     changeNotes """
-      - Support for `@file:JvmName()` <br>
-      - Performance improvement <br>
       - Option to view usages in "Find" tool window <br>
       - Improved the UI of the usages popup <br>
+      - Support for Enums <br>
+      - Support for `@file:JvmName()` <br>
+      - Performance improvement <br>
     """
 }
diff --git a/src/main/kotlin/com/madrapps/eventbus/subscribe/SubscribeLineMarkerProvider.kt b/src/main/kotlin/com/madrapps/eventbus/subscribe/SubscribeLineMarkerProvider.kt
@@ -6,7 +6,9 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.editor.markup.GutterIconRenderer.Alignment.RIGHT
 import com.intellij.openapi.util.IconLoader
+import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiEnumConstant
 import com.intellij.psi.impl.source.PsiClassReferenceType
 import com.intellij.ui.awt.RelativePoint
 import com.intellij.usageView.UsageInfo
@@ -75,9 +77,17 @@ private class SubscribeLineMarkerInfo(
                 val elementToSearch =
                     (uElement.uastParameters[0].type as PsiClassReferenceType).reference.resolve()
                 if (elementToSearch != null) {
-                    usages = search(elementToSearch)
-                        .filter(UsageInfo::isPost)
-                        .map(::UsageInfo2UsageAdapter)
+                    val psiClassElement = elementToSearch.toUElement()
+                    usages = if((psiClassElement as? PsiClass)?.isEnum == true) {
+                        val elementsToSearch = psiClassElement.allFields.filterIsInstance<PsiEnumConstant>()
+                        search(elementsToSearch)
+                            .filter(UsageInfo::isPost)
+                            .map(::UsageInfo2UsageAdapter)
+                    } else {
+                        search(elementToSearch)
+                            .filter(UsageInfo::isPost)
+                            .map(::UsageInfo2UsageAdapter)
+                    }
                 }
             }
             ApplicationManager.getApplication().invokeLater {