Support multi-target mixin injectors

2 files changed, 14 insertions, 7 deletions

diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
index 412b6bf..a71c4d1 100644
--- a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
+++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
@@ -481,10 +481,8 @@ internal class PsiMapper(
                         ?: method.getAnnotation(CLASS_REDIRECT)
                         ?: return
 
-                for (attribute in annotation.parameterList.attributes) {
-                    if ("method" != attribute.name) continue
-                    // Note: mixin supports multiple targets, we do not (yet)
-                    val (literalExpr, literalValue) = attribute.resolvedLiteralValue ?: continue
+                val methodAttrib = annotation.findDeclaredAttributeValue("method")
+                for ((literalExpr, literalValue) in methodAttrib?.resolvedLiteralValues ?: emptyList()) {
                     val (targetName, targetDesc) = if ('(' in literalValue) {
                         MethodSignature.of(literalValue).let { it.name to it.descriptor.toString() }
                     } else {
@@ -497,7 +495,7 @@ internal class PsiMapper(
                         }
                     } else {
                         if (targetMethods.size > 1) {
-                            error(attribute, "Ambiguous mixin method \"$targetName\" may refer to any of: ${targetMethods.joinToString { 
+                            error(literalExpr, "Ambiguous mixin method \"$targetName\" may refer to any of: ${targetMethods.joinToString { 
                                 "\"${it.name}${ClassUtil.getAsmMethodSignature(it)}\"" 
                             }}")
                         }
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiUtils.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiUtils.kt
index 936ab89..de42dcf 100644
--- a/src/main/kotlin/com/replaymod/gradle/remap/PsiUtils.kt
+++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiUtils.kt
@@ -19,8 +19,11 @@ internal val PsiClass.dollarQualifiedName: String? get() {
     return "$parentName$$selfName"
 }
 
-internal val PsiNameValuePair.resolvedLiteralValue: Pair<PsiLiteralExpression, String>? get () {
-    var value: PsiElement? = value
+internal val PsiNameValuePair.resolvedLiteralValue: Pair<PsiLiteralExpression, String>?
+    get () = value?.resolvedLiteralValue
+
+private val PsiElement.resolvedLiteralValue: Pair<PsiLiteralExpression, String>? get () {
+    var value: PsiElement? = this
     while (value is PsiReferenceExpression) {
         val resolved = value.resolve()
         value = when (resolved) {
@@ -32,6 +35,12 @@ internal val PsiNameValuePair.resolvedLiteralValue: Pair<PsiLiteralExpression, S
     return Pair(literal, StringUtil.unquoteString(literal.text))
 }
 
+internal val PsiAnnotationMemberValue.resolvedLiteralValues: List<Pair<PsiLiteralExpression, String>>
+    get () = when (this) {
+        is PsiArrayInitializerMemberValue -> initializers.mapNotNull { it.resolvedLiteralValue }
+        else -> listOfNotNull(resolvedLiteralValue)
+    }
+
 internal object PsiUtils {
     fun getSignature(method: PsiMethod): MethodSignature = MethodSignature(method.name, getDescriptor(method))