Switch from using entry points to implicit usage providers for mixin annotations. This allows ME sugars to be reported unused

Earthcomputer · Earthcomputer · commit 175d500d634b · 2025-11-05T22:44:30.000Z
diff --git a/src/main/kotlin/platform/mixin/MixinCustomJavaDocTagProvider.kt b/src/main/kotlin/platform/mixin/MixinCustomJavaDocTagProvider.kt
@@ -20,8 +20,9 @@
 
 package com.demonwav.mcdev.platform.mixin
 
-import com.demonwav.mcdev.platform.mixin.util.isMixinEntryPoint
+import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiReference
 import com.intellij.psi.javadoc.CustomJavadocTagProvider
 import com.intellij.psi.javadoc.JavadocTagInfo
@@ -35,7 +36,13 @@ class MixinCustomJavaDocTagProvider : CustomJavadocTagProvider {
 
         override fun isInline() = false
 
-        override fun isValidInContext(element: PsiElement?) = isMixinEntryPoint(element)
+        override fun isValidInContext(element: PsiElement?): Boolean {
+            if (element !is PsiMember) {
+                return false
+            }
+
+            return element.annotations.any { MixinAnnotationHandler.forMixinAnnotation(it) != null }
+        }
 
         override fun checkTagValue(value: PsiDocTagValue?): String? = null
         override fun getReference(value: PsiDocTagValue?): PsiReference? = null
diff --git a/src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt b/src/main/kotlin/platform/mixin/handlers/AccessorHandler.kt
@@ -108,7 +108,7 @@ class AccessorHandler : MixinMemberAnnotationHandler {
         ).createSmartPointer()
     }
 
-    override val isEntryPoint = false
+    override val isImplicitlyUsed = false
 
     override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
 
diff --git a/src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt b/src/main/kotlin/platform/mixin/handlers/InjectorAnnotationHandler.kt
@@ -182,7 +182,7 @@ abstract class InjectorAnnotationHandler : MixinAnnotationHandler {
 
     open val isShiftAlwaysDiscouraged = true
 
-    override val isEntryPoint = true
+    override val isImplicitlyUsed = true
 
     override val icon = MixinAssets.MIXIN_INJECTOR_ICON
 
diff --git a/src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt b/src/main/kotlin/platform/mixin/handlers/InvokerHandler.kt
@@ -109,7 +109,7 @@ class InvokerHandler : MixinMemberAnnotationHandler {
         ).createSmartPointer()
     }
 
-    override val isEntryPoint = false
+    override val isImplicitlyUsed = false
 
     override val icon = MixinAssets.MIXIN_ACCESSOR_ICON
 }
diff --git a/src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt b/src/main/kotlin/platform/mixin/handlers/MixinAnnotationHandler.kt
@@ -76,10 +76,9 @@ interface MixinAnnotationHandler {
     val isSoft: Boolean get() = false
 
     /**
-     * Returns whether elements annotated with this annotation should be considered "entry points",
-     * i.e. not reported as unused
+     * Returns whether elements annotated with this annotation should not be reported as unused
      */
-    val isEntryPoint: Boolean
+    val isImplicitlyUsed: Boolean
 
     val icon: Icon get() = MixinAssets.MIXIN_ELEMENT_ICON
 
diff --git a/src/main/kotlin/platform/mixin/handlers/OverwriteHandler.kt b/src/main/kotlin/platform/mixin/handlers/OverwriteHandler.kt
@@ -41,5 +41,5 @@ class OverwriteHandler : MixinMemberAnnotationHandler {
         return "Unresolved method ${method.name} in target class"
     }
 
-    override val isEntryPoint = true
+    override val isImplicitlyUsed = true
 }
diff --git a/src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt b/src/main/kotlin/platform/mixin/handlers/ShadowHandler.kt
@@ -101,7 +101,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
         return (member.name ?: return null).removePrefix(prefix)
     }
 
-    override val isEntryPoint = false
+    override val isImplicitlyUsed = false
 
     override val icon = MixinAssets.MIXIN_SHADOW_ICON
 
diff --git a/src/main/kotlin/platform/mixin/insight/MixinEntryPoint.kt b/src/main/kotlin/platform/mixin/insight/MixinEntryPoint.kt
@@ -22,8 +22,6 @@ package com.demonwav.mcdev.platform.mixin.insight
 
 import com.demonwav.mcdev.platform.mixin.handlers.InjectorAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
-import com.demonwav.mcdev.platform.mixin.util.isMixinEntryPoint
-import com.demonwav.mcdev.util.toTypedArray
 import com.intellij.codeInspection.reference.RefElement
 import com.intellij.codeInspection.visibility.EntryPointWithVisibilityLevel
 import com.intellij.psi.PsiElement
@@ -42,17 +40,9 @@ class MixinEntryPoint : EntryPointWithVisibilityLevel() {
     override fun getDisplayName() = "Mixin injectors"
     override fun getTitle() = "Suggest private visibility level for Mixin injectors"
 
-    // TODO: support more handlers than the builtin
-    // need to find a way to access the project for that
-    override fun getIgnoreAnnotations() =
-        MixinAnnotationHandler.getBuiltinHandlers()
-            .filter { (_, handler) -> handler.isEntryPoint }
-            .map { (name, _) -> name }
-            .toTypedArray()
+    override fun isEntryPoint(element: PsiElement) = false
 
-    override fun isEntryPoint(element: PsiElement) = isMixinEntryPoint(element)
-
-    override fun isEntryPoint(refElement: RefElement, psiElement: PsiElement) = isEntryPoint(psiElement)
+    override fun isEntryPoint(refElement: RefElement, psiElement: PsiElement) = false
 
     override fun getMinVisibilityLevel(member: PsiMember): Int {
         if (member !is PsiMethod) {
diff --git a/src/main/kotlin/platform/mixin/insight/MixinImplicitUsageProvider.kt b/src/main/kotlin/platform/mixin/insight/MixinImplicitUsageProvider.kt
@@ -20,11 +20,14 @@
 
 package com.demonwav.mcdev.platform.mixin.insight
 
+import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.SHADOW
+import com.demonwav.mcdev.platform.mixin.util.isMixinExtrasSugar
 import com.intellij.codeInsight.daemon.ImplicitUsageProvider
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
+import com.intellij.psi.PsiModifierListOwner
 import com.intellij.psi.PsiParameter
 
 class MixinImplicitUsageProvider : ImplicitUsageProvider {
@@ -40,7 +43,30 @@ class MixinImplicitUsageProvider : ImplicitUsageProvider {
         return method.hasAnnotation(SHADOW)
     }
 
-    override fun isImplicitUsage(element: PsiElement) = isParameterInShadow(element)
+    private fun isHandlerImplicitlyUsed(element: PsiElement): Boolean {
+        if (element is PsiParameter) {
+            if (element.isMixinExtrasSugar) {
+                return false
+            }
+
+            val declarationScope = element.declarationScope
+            return if (declarationScope is PsiMethod) {
+                isHandlerImplicitlyUsed(declarationScope)
+            } else {
+                false
+            }
+        }
+
+        if (element is PsiModifierListOwner) {
+            return element.annotations.any {
+                MixinAnnotationHandler.forMixinAnnotation(it)?.isImplicitlyUsed == true
+            }
+        }
+
+        return false
+    }
+
+    override fun isImplicitUsage(element: PsiElement) = isParameterInShadow(element) || isHandlerImplicitlyUsed(element)
     override fun isImplicitRead(element: PsiElement) = isShadowField(element)
     override fun isImplicitWrite(element: PsiElement) = isShadowField(element)
 }
diff --git a/src/main/kotlin/platform/mixin/util/Mixin.kt b/src/main/kotlin/platform/mixin/util/Mixin.kt
@@ -21,7 +21,6 @@
 package com.demonwav.mcdev.platform.mixin.util
 
 import com.demonwav.mcdev.platform.mixin.action.FindMixinsAction
-import com.demonwav.mcdev.platform.mixin.handlers.MixinAnnotationHandler
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.ACCESSOR
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.INVOKER
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants.Annotations.MIXIN
@@ -36,7 +35,6 @@ import com.demonwav.mcdev.util.findModule
 import com.demonwav.mcdev.util.resolveClassArray
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
-import com.intellij.platform.ide.progress.ModalTaskOwner.project
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiAnnotation
 import com.intellij.psi.PsiArrayType
@@ -46,7 +44,6 @@ import com.intellij.psi.PsiDisjunctionType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIntersectionType
 import com.intellij.psi.PsiLiteralExpression
-import com.intellij.psi.PsiMethod
 import com.intellij.psi.PsiParameter
 import com.intellij.psi.PsiPrimitiveType
 import com.intellij.psi.PsiType
@@ -149,7 +146,7 @@ val PsiParameter.isMixinExtrasSugar: Boolean
 
 val PsiType.isLocalRef: Boolean
     get() {
-        return PsiTypesUtil.getPsiClass(this)?.qualifiedName?.startsWith(MixinConstants.MixinExtras.LOCAL_REF_PACKAGE) == true
+        return PsiTypesUtil.getPsiClass(this)?.qualifiedName?.startsWith(LOCAL_REF_PACKAGE) == true
     }
 
 fun PsiType.unwrapLocalRef(): PsiType {
@@ -290,20 +287,6 @@ private fun isClassAssignable(leftClass: PsiClass, rightClass: PsiClass): Boolea
     return result
 }
 
-fun isMixinEntryPoint(element: PsiElement?): Boolean {
-    if (element !is PsiMethod) {
-        return false
-    }
-    val project = element.project
-    for (annotation in element.annotations) {
-        val handler = MixinAnnotationHandler.forMixinAnnotation(annotation, project)
-        if (handler != null && handler.isEntryPoint) {
-            return true
-        }
-    }
-    return false
-}
-
 val PsiElement.isFabricMixin: Boolean get() =
     JavaPsiFacade.getInstance(project).findClass(MixinConstants.Classes.FABRIC_UTIL, resolveScope) != null
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ class AccessorHandler : MixinMemberAnnotationHandler {`
`108`	`108`	`).createSmartPointer()`
`109`	`109`	`}`
`110`	`110`
`111`		`- override val isEntryPoint = false`
	`111`	`+ override val isImplicitlyUsed = false`
`112`	`112`
`113`	`113`	`override val icon = MixinAssets.MIXIN_ACCESSOR_ICON`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class InvokerHandler : MixinMemberAnnotationHandler {`
`109`	`109`	`).createSmartPointer()`
`110`	`110`	`}`
`111`	`111`
`112`		`- override val isEntryPoint = false`
	`112`	`+ override val isImplicitlyUsed = false`
`113`	`113`
`114`	`114`	`override val icon = MixinAssets.MIXIN_ACCESSOR_ICON`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ class OverwriteHandler : MixinMemberAnnotationHandler {`
`41`	`41`	`return "Unresolved method ${method.name} in target class"`
`42`	`42`	`}`
`43`	`43`
`44`		`- override val isEntryPoint = true`
	`44`	`+ override val isImplicitlyUsed = true`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {`
`101`	`101`	`return (member.name ?: return null).removePrefix(prefix)`
`102`	`102`	`}`
`103`	`103`
`104`		`- override val isEntryPoint = false`
	`104`	`+ override val isImplicitlyUsed = false`
`105`	`105`
`106`	`106`	`override val icon = MixinAssets.MIXIN_SHADOW_ICON`
`107`	`107`