Remap @desc targets in injections

Author: jamierocks

src/main/java/org/cadixdev/mercury/mixin/MixinRemapperVisitor.java

@@ -308,7 +308,7 @@ public boolean visit(final MethodDeclaration node) {
                 }
             }
 
-            // @Inject, @Redirect, @ModifyConstant, & @ModifyVariable
+            // @Inject, @Redirect, @ModifyConstant, @ModifyVariable
             if (Objects.equals(INJECT_CLASS, annotationType)
                     || Objects.equals(REDIRECT_CLASS, annotationType)
                     || Objects.equals(MODIFY_CONSTANT_CLASS, annotationType)
@@ -344,6 +344,21 @@ else if (pair.getValue() instanceof ArrayInitializer) {
                         }
                     }
 
+                    // Remap the @Desc targets
+                    if ("target".equals(pair.getName().getIdentifier())) {
+                        if (pair.getValue() instanceof Annotation) {
+                            final Annotation original = (Annotation) pair.getValue();
+                            this.remapDescAnnotation(ast, declaringClass, original, inject.getDescTargets()[0]);
+                        }
+                        else if (pair.getValue() instanceof ArrayInitializer) {
+                            final ArrayInitializer array = (ArrayInitializer) pair.getValue();
+                            for (int j = 0; j < array.expressions().size(); j++) {
+                                final Annotation original = (Annotation) array.expressions().get(j);
+                                this.remapDescAnnotation(ast, declaringClass, original, inject.getDescTargets()[j]);
+                            }
+                        }
+                    }
+
                     // Remap @At
                     if (Objects.equals("at", pair.getName().getIdentifier())) {
                         // it could be a SingleMemberAnnotation here but we don't care about that case

src/main/java/org/cadixdev/mercury/mixin/annotation/InjectData.java

@@ -23,6 +23,7 @@ public class InjectData {
     // @Inject(method={"example"}, at=@At(...))
     public static InjectData from(final IAnnotationBinding binding) {
         InjectTarget[] injectTargets = {};
+        DescData[] descTargets = {};
         AtData[] atData = {};
         SliceData[] sliceData = {};
 
@@ -35,6 +36,14 @@ public static InjectData from(final IAnnotationBinding binding) {
                     injectTargets[i] = InjectTarget.of((String) raw[i]);
                 }
             }
+            else if ("target".equals(pair.getName())) {
+                final Object[] raw = (Object[]) pair.getValue();
+
+                descTargets = new DescData[raw.length];
+                for (int i = 0; i < raw.length; i++) {
+                    descTargets[i] = DescData.from((IAnnotationBinding) raw[i]);
+                }
+            }
             else if (Objects.equals("at", pair.getName())) {
                 final Object value = pair.getValue();
 
@@ -71,15 +80,17 @@ else if (value instanceof IAnnotationBinding) {
             }
         }
 
-        return new InjectData(injectTargets, atData, sliceData);
+        return new InjectData(injectTargets, descTargets, atData, sliceData);
     }
 
     private final InjectTarget[] injectTargets;
+    private final DescData[] descTargets;
     private final AtData[] atData;
     private final SliceData[] sliceData;
 
-    public InjectData(final InjectTarget[] injectTargets, final AtData[] atData, final SliceData[] sliceData) {
+    public InjectData(final InjectTarget[] injectTargets, final DescData[] descTargets, final AtData[] atData, final SliceData[] sliceData) {
         this.injectTargets = injectTargets;
+        this.descTargets = descTargets;
         this.atData = atData;
         this.sliceData = sliceData;
     }
@@ -88,6 +99,10 @@ public InjectTarget[] getInjectTargets() {
         return this.injectTargets;
     }
 
+    public DescData[] getDescTargets() {
+        return this.descTargets;
+    }
+
     public AtData[] getAtData() {
         return this.atData;
     }

src/test/resources/mixin/a/TestTargetMixin.java

@@ -49,6 +49,11 @@ public void onStart(final CallbackInfo callbackInfo) {
         System.out.println("Hello, world!");
     }
 
+    @Inject(target = {@Desc("hhj"), @Desc("jjjj")}, at = @At("HEAD"))
+    public void onStartModernTarget(final CallbackInfo callbackInfo) {
+        System.out.println("Hello, world!");
+    }
+
     @Inject(method = {"hhj()V", "jjjj"}, at = @At("HEAD"))
     public void onStart2(final CallbackInfo callbackInfo) {
         System.out.println("Hello, world!");
@@ -69,6 +74,11 @@ public void injectIntoUnknownMethod(final CallbackInfo callbackInfo) {
         System.out.println("Hello from injection part 2!");
     }
 
+    @Inject(target = @Desc("hhj"), at = @At(value = "INVOKE", target = "Lhj;unknownMethod()V"))
+    public void injectIntoUnknownMethodModernTarget(final CallbackInfo callbackInfo) {
+        System.out.println("Hello from injection part 2!");
+    }
+
     @Inject(method = "hhj", at = {
             @At("HEAD"),
             @At(value = "INVOKE", target = "Lhj;julp()I"),

src/test/resources/mixin/b/TestTargetMixin.java

@@ -49,6 +49,11 @@ public void onStart(final CallbackInfo callbackInfo) {
         System.out.println("Hello, world!");
     }
 
+    @Inject(target = {@Desc("start"), @Desc("jjjj")}, at = @At("HEAD"))
+    public void onStartModernTarget(final CallbackInfo callbackInfo) {
+        System.out.println("Hello, world!");
+    }
+
     @Inject(method = {"start()V", "jjjj"}, at = @At("HEAD"))
     public void onStart2(final CallbackInfo callbackInfo) {
         System.out.println("Hello, world!");
@@ -69,6 +74,11 @@ public void injectIntoUnknownMethod(final CallbackInfo callbackInfo) {
         System.out.println("Hello from injection part 2!");
     }
 
+    @Inject(target = @Desc("start"), at = @At(value = "INVOKE", target = "LTestTarget;unknownMethod()V"))
+    public void injectIntoUnknownMethodModernTarget(final CallbackInfo callbackInfo) {
+        System.out.println("Hello from injection part 2!");
+    }
+
     @Inject(method = "start", at = {
             @At("HEAD"),
             @At(value = "INVOKE", target = "LTestTarget;getAge()I"),