Feature/enum extensions

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

@@ -48,7 +48,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
     override fun resolveTarget(annotation: PsiAnnotation, targetClass: ClassNode): List<MixinTargetMember> {
         if (hasAliases(annotation)) return emptyList()
         val member = annotation.parentOfType<PsiMember>() ?: return emptyList()
-        val name = stripPrefix(annotation, member) ?: return emptyList()
+        val name = getEffectiveName(annotation, member) ?: return emptyList()
         return when (member) {
             is PsiMethod -> listOfNotNull(
                 targetClass.findMethod(MemberReference(name, member.descriptor))
@@ -75,7 +75,7 @@ class ShadowHandler : MixinMemberAnnotationHandler {
             is PsiField -> "field"
             else -> return null
         }
-        return "Unresolved $type ${member.name} in target class"
+        return "Unresolved $type ${getEffectiveName(annotation, member)} in target class"
     }
 
     fun findFirstShadowTargetForNavigation(member: PsiMember): SmartPsiElementPointer<PsiElement>? {
@@ -94,7 +94,10 @@ class ShadowHandler : MixinMemberAnnotationHandler {
 
     private fun hasAliases(shadow: PsiAnnotation) = shadow.findDeclaredAttributeValue("aliases").isNotEmpty()
 
-    private fun stripPrefix(shadow: PsiAnnotation, member: PsiMember): String? {
+    private fun getEffectiveName(shadow: PsiAnnotation, member: PsiMember): String? {
+        if (member is PsiMethod && member.isConstructor) {
+            return "<init>"
+        }
         // Strip prefix
         val prefix = shadow.findDeclaredAttributeValue("prefix")?.constantStringValue
             ?: MixinConstants.DEFAULT_SHADOW_PREFIX

src/main/kotlin/platform/mixin/inspection/MixinClassTypeInspection.kt

@@ -22,6 +22,7 @@ package com.demonwav.mcdev.platform.mixin.inspection
 
 import com.demonwav.mcdev.platform.mixin.util.hasAccess
 import com.demonwav.mcdev.platform.mixin.util.isAccessorMixin
+import com.demonwav.mcdev.platform.mixin.util.isFabricMixin
 import com.demonwav.mcdev.platform.mixin.util.isMixin
 import com.demonwav.mcdev.platform.mixin.util.mixinTargets
 import com.intellij.codeInspection.LocalQuickFix
@@ -68,7 +69,7 @@ class MixinClassTypeInspection : MixinInspection() {
                 }
             }
 
-            if (mixinClass.isEnum) {
+            if (mixinClass.isEnum && !mixinClass.isFabricMixin) {
                 holder.registerProblem(problemElement, "Mixins cannot be enums", *fixes.toTypedArray())
                 return
             }

src/main/kotlin/platform/mixin/inspection/StaticMemberInspection.kt

@@ -30,6 +30,7 @@ import com.intellij.codeInsight.intention.QuickFixFactory
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.JavaElementVisitor
 import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiEnumConstant
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMember
 import com.intellij.psi.PsiMethod
@@ -71,7 +72,7 @@ class StaticMemberInspection : MixinInspection() {
 
         private fun isProblematic(member: PsiMember): Boolean {
             val containingClass = member.containingClass ?: return false
-            if (!containingClass.isMixin) {
+            if (!containingClass.isMixin || member is PsiEnumConstant) {
                 return false
             }
 

src/main/kotlin/platform/mixin/inspection/addedMembers/MissingUniqueAnnotationInspection.kt

@@ -24,13 +24,17 @@ import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.intellij.codeInsight.intention.AddAnnotationModCommandAction
 import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.PsiEnumConstant
 import com.intellij.psi.PsiField
 import com.intellij.psi.PsiMethod
 
 class MissingUniqueAnnotationInspection : AbstractAddedMembersInspection() {
     override fun getStaticDescription() = "Reports missing @Unique annotations"
 
     override fun visitAddedField(holder: ProblemsHolder, field: PsiField) {
+        if (field is PsiEnumConstant) {
+            return
+        }
         if (!field.hasAnnotation(MixinConstants.Annotations.UNIQUE)) {
             holder.registerProblem(
                 field.nameIdentifier,

src/main/kotlin/util/bytecode-utils.kt

@@ -172,9 +172,12 @@ private fun PsiMethod.appendDescriptor(builder: StringBuilder): StringBuilder {
     builder.append('(')
     if (isConstructor) {
         containingClass?.let { containingClass ->
-            if (containingClass.hasModifierProperty(PsiModifier.STATIC)) return@let
-            val outerClass = containingClass.containingClass
-            outerClass?.type()?.appendDescriptor(builder)
+            if (containingClass.isEnum) {
+                builder.append("Ljava/lang/String;I")
+            } else if (!containingClass.hasModifierProperty(PsiModifier.STATIC)) {
+                val outerClass = containingClass.containingClass
+                outerClass?.type()?.appendDescriptor(builder)
+            }
         }
     }
     for (parameter in parameterList.parameters) {