From b4462eb6030f8e5a072ad4b6508d7a93d574522f Mon Sep 17 00:00:00 2001
From: Jonas Herzig <jonas@spark-squared.com>
Date: Thu, 11 Nov 2021 15:06:54 +0100
Subject: Fix mixin @At target not considering mappings from parent classes

When remapping the @At `target` argument, we used to only look at the mappings
for the target class but we also need to consider mappings for its super classes
and interfaces.
This commit now searches for the target Psi method and then uses the regular
remap method for PsiMethod to get its properly mapped name.
---
 .../gradle/remap/mapper/TestMixinInjections.kt     | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'src/test/kotlin/com/replaymod/gradle/remap/mapper')

diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
index 3f8d55f..f01a832 100644
--- a/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
+++ b/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
@@ -137,4 +137,46 @@ class TestMixinInjections {
             }
         """.trimIndent()
     }
+
+    @Test
+    fun `remaps @At target`() {
+        TestData.remap("""
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(a.pkg.A.class)
+            class MixinA {
+                @Inject(method = "aMethod", at = @At(target = "La/pkg/A;aInterfaceMethod()V"))
+                private void test() {}
+            }
+        """.trimIndent()) shouldBe """
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class)
+            class MixinA {
+                @Inject(method = "bMethod", at = @At(target = "Lb/pkg/B;bInterfaceMethod()V"))
+                private void test() {}
+            }
+        """.trimIndent()
+    }
+
+    @Test
+    fun `remaps @At target without mappings for target`() {
+        TestData.remap("""
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(a.pkg.A.class)
+            class MixinA {
+                @Inject(method = "aMethod", at = @At(target = "La/pkg/A;unmappedOverloaded(La/pkg/A;)V"))
+                private void test() {}
+            }
+        """.trimIndent()) shouldBe """
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class)
+            class MixinA {
+                @Inject(method = "bMethod", at = @At(target = "Lb/pkg/B;unmappedOverloaded(Lb/pkg/B;)V"))
+                private void test() {}
+            }
+        """.trimIndent()
+    }
 }
\ No newline at end of file
-- 
cgit