Add more mixin icons for different types of annotations and accessor mixins

Co-authored-by: Voided Aries <[email protected]>

Author: Earthcomputer

src/main/kotlin/asset/MixinAssets.kt

@@ -22,14 +22,30 @@ package com.demonwav.mcdev.asset
 
 @Suppress("unused")
 object MixinAssets : Assets() {
-    val MIXIN_ELEMENT_ICON = loadIcon("/assets/icons/mixin/mixin_element.svg")
-    val MIXIN_ELEMENT_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_element_dark.svg")
+    val MIXIN_ACCESSOR_ICON = loadIcon("/assets/icons/mixin/mixin_accessor.svg")
+    val MIXIN_ACCESSOR_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_accessor_dark.svg")
+
+    val MIXIN_ACCESSOR_MIXIN_ICON = loadIcon("/assets/icons/mixin/mixin_accessor_mixin.svg")
+    val MIXIN_ACCESSOR_MIXIN_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_accessor_mixin_dark.svg")
 
     val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.svg")
     val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.svg")
 
-    val MIXIN_CLASS_TARGET_ICON = loadIcon("/assets/icons/mixin/mixin_class_target_gutter.svg")
-    val MIXIN_CLASS_TARGET_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_target_gutter_dark.svg")
+    val MIXIN_ELEMENT_ICON = loadIcon("/assets/icons/mixin/mixin_element.svg")
+    val MIXIN_ELEMENT_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_element_dark.svg")
+
+    val MIXIN_INJECTOR_ICON = loadIcon("/assets/icons/mixin/mixin_injector.svg")
+    val MIXIN_INJECTOR_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_injector_dark.svg")
+
+    val MIXIN_SHADOW_ICON = loadIcon("/assets/icons/mixin/mixin_shadow.svg")
+    val MIXIN_SHADOW_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_shadow_dark_alt.svg")
+
+    val MIXIN_TARGET_ACCESSOR_MIXIN_ICON = loadIcon("/assets/icons/mixin/mixin_target_accessor_mixin.svg")
+    val MIXIN_TARGET_ACCESSOR_MIXIN_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_target_accessor_mixin_dark.svg")
+
+    val MIXIN_TARGET_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_target_class_gutter.svg")
+    val MIXIN_TARGET_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_target_class_gutter_dark.svg")
 
     val MIXIN_MARK = loadIcon("/assets/icons/mixin/mixin_mark.svg")
+    val ACCESSOR_MARK = loadIcon("/assets/icons/mixin/accessor_mark.svg")
 }

src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt

@@ -22,18 +22,26 @@ package com.demonwav.mcdev.platform.mixin.framework
 
 import com.demonwav.mcdev.MinecraftSettings
 import com.demonwav.mcdev.asset.MixinAssets
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.intellij.ide.IconLayerProvider
 import com.intellij.openapi.util.Iconable
 import com.intellij.psi.PsiClass
 import javax.swing.Icon
 
 class MixinIconProvider : IconLayerProvider {
-    override fun getLayerIcon(element: Iconable, isLocked: Boolean): Icon? =
-        MixinAssets.MIXIN_MARK.takeIf {
-            MinecraftSettings.instance.mixinClassIcon && element is PsiClass && element.isMixin
+    override fun getLayerIcon(element: Iconable, isLocked: Boolean): Icon? {
+        if (!MinecraftSettings.instance.mixinClassIcon || element !is PsiClass || !element.isMixin) {
+            return null
         }
 
+        return if (element.isAccessorMixin) {
+            MixinAssets.ACCESSOR_MARK
+        } else {
+            MixinAssets.MIXIN_MARK
+        }
+    }
+
     override fun getLayerDescription(): String =
         "Mixin class"
 }

src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.FieldTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.ACCESSOR
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -108,6 +109,8 @@ class AccessorHandler : MixinMemberAnnotationHandler {
 
     override val isEntryPoint = false
 
+    override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
+
     data class AccessorInfo(val name: String, val type: AccessorType)
 
     enum class AccessorType(val allowGetters: Boolean, val allowSetters: Boolean) {

src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.AtResolver
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.CollectVisitor
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
@@ -174,6 +175,8 @@ abstract class InjectorAnnotationHandler : MixinAnnotationHandler {
 
     override val isEntryPoint = true
 
+    override val icon = MixinAssets.MIXIN_INJECTOR_ICON
+
     abstract val mixinExtrasExpressionContextType: ExpressionContext.Type
 
     data class InsnResult(val method: ClassAndMethodNode, val result: CollectVisitor.Result<*>)

src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.INVOKER
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -108,4 +109,6 @@ class InvokerHandler : MixinMemberAnnotationHandler {
     }
 
     override val isEntryPoint = false
+
+    override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
 }

src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.MixinTargetMember
@@ -43,6 +44,7 @@ import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.serviceContainer.BaseKeyedLazyInstance
 import com.intellij.util.KeyedLazyInstance
 import com.intellij.util.xmlb.annotations.Attribute
+import javax.swing.Icon
 import org.objectweb.asm.tree.ClassNode
 
 interface MixinAnnotationHandler {
@@ -83,6 +85,8 @@ interface MixinAnnotationHandler {
      */
     val isEntryPoint: Boolean
 
+    val icon: Icon get() = MixinAssets.MIXIN_ELEMENT_ICON
+
     companion object {
         private val EP_NAME = ExtensionPointName<KeyedLazyInstance<MixinAnnotationHandler>>(
             "com.demonwav.minecraft-dev.mixinAnnotationHandler",

src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.handlers
 
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.handlers.injectionPoint.InsnResolutionInfo
 import com.demonwav.mcdev.platform.mixin.util.FieldTargetMember
 import com.demonwav.mcdev.platform.mixin.util.MethodTargetMember
@@ -102,6 +103,8 @@ class ShadowHandler : MixinMemberAnnotationHandler {
 
     override val isEntryPoint = false
 
+    override val icon = MixinAssets.MIXIN_SHADOW_ICON
+
     companion object {
         fun getInstance(): ShadowHandler? {
             return MixinAnnotationHandler.forMixinAnnotation(SHADOW) as? ShadowHandler

src/main/kotlin/platform/mixin/insight/MixinElementLineMarkerProvider.kt

@@ -76,7 +76,7 @@ class MixinElementLineMarkerProvider : LineMarkerProviderDescriptor() {
         return LineMarkerInfo(
             identifier,
             identifier.textRange,
-            icon,
+            handler.icon,
             { "Go to the $simpleName target" },
             MixinGutterIconNavigationHandler(identifier.createSmartPointer(), annotation.createSmartPointer(), handler),
             GutterIconRenderer.Alignment.LEFT,

src/main/kotlin/platform/mixin/insight/MixinLineMarkerProvider.kt

@@ -22,6 +22,7 @@ package com.demonwav.mcdev.platform.mixin.insight
 
 import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.findSourceClass
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.demonwav.mcdev.platform.mixin.util.mixinTargets
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
@@ -50,6 +51,12 @@ class MixinLineMarkerProvider : LineMarkerProviderDescriptor(), GutterIconNaviga
             return null
         }
 
+        val icon = if (element.isAccessorMixin) {
+            MixinAssets.MIXIN_ACCESSOR_MIXIN_ICON
+        } else {
+            icon
+        }
+
         return LineMarkerInfo(
             identifier,
             identifier.textRange,

src/main/kotlin/platform/mixin/insight/target/MixinAccessorTargetLineMarkerProvider.kt

@@ -0,0 +1,80 @@
+/*
+ * Minecraft Development for IntelliJ
+ *
+ * https://mcdev.io/
+ *
+ * Copyright (C) 2025 minecraft-dev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, version 3.0 only.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.demonwav.mcdev.platform.mixin.insight.target
+
+import com.demonwav.mcdev.asset.MixinAssets
+import com.demonwav.mcdev.platform.mixin.action.FindMixinsAction
+import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
+import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
+import com.intellij.codeInsight.daemon.LineMarkerInfo
+import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
+import com.intellij.openapi.editor.markup.GutterIconRenderer
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import com.intellij.ui.awt.RelativePoint
+import java.awt.event.MouseEvent
+
+class MixinAccessorTargetLineMarkerProvider : LineMarkerProviderDescriptor(), GutterIconNavigationHandler<PsiIdentifier> {
+    override fun getName() = "Accessor mixin target line marker"
+    override fun getIcon() = MixinAssets.MIXIN_TARGET_ACCESSOR_MIXIN_ICON
+
+    override fun getLineMarkerInfo(element: PsiElement) = null
+
+    override fun collectSlowLineMarkers(
+        elements: List<PsiElement>,
+        result: MutableCollection<in LineMarkerInfo<*>>
+    ) {
+        for (element in elements) {
+            if (element !is PsiClass) {
+                continue
+            }
+
+            val identifier = element.nameIdentifier ?: continue
+
+            val mixins = FindMixinsAction.findMixins(element, element.project) ?: continue
+            if (mixins.none { it.isAccessorMixin }) {
+                continue
+            }
+
+            result += LineMarkerInfo(
+                identifier,
+                identifier.textRange,
+                icon,
+                { "Go to accessor mixins" },
+                this,
+                GutterIconRenderer.Alignment.LEFT,
+                { "accessor mixin target class indicator" },
+            )
+        }
+    }
+
+    override fun navigate(e: MouseEvent, elt: PsiIdentifier) {
+        val targetClass = elt.parent as? PsiClass ?: return
+        FindMixinsAction.openFindMixinsUI(
+            targetClass.project,
+            targetClass,
+            { show(RelativePoint(e)) }
+        ) {
+            it.isAccessorMixin
+        }
+    }
+}