Use the right index for writing type annotations

Author: jaskarth

src/org/jetbrains/java/decompiler/main/ClassWriter.java

@@ -1409,7 +1409,7 @@ else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarT
             DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
           typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
         }
-        var annos = getTypeAnnotations(mt, TypeAnnotation.METHOD_PARAMETER, i);
+        var annos = getTypeAnnotations(mt, TypeAnnotation.METHOD_PARAMETER, paramCount);
         if (!annos.isEmpty()) {
           VarType tempParam = parameterType;
           // Undo varargs change

testData/results/pkg/TestTypeAnnotations.dec

@@ -33,46 +33,46 @@ public class TestTypeAnnotations {
    public TestTypeAnnotations.G2<String, @TestTypeAnnotations.Anno Integer> x;
 
    public @TestTypeAnnotations.Anno TestTypeAnnotations.Inner a() {
-      return null;// 93
+      return null;// 97
    }
 
    public [email protected] Inner b() {
-      return null;// 97
+      return null;// 101
    }
 
    public [email protected] InnerStatic c() {
-      return null;// 101
+      return null;// 105
    }
 
    public @TestTypeAnnotations.Anno TestTypeAnnotations[] d() {
-      return null;// 105
+      return null;// 109
    }
 
    public TestTypeAnnotations @TestTypeAnnotations.Anno [] e() {
-      return null;// 109
+      return null;// 113
    }
 
    public byte @TestTypeAnnotations.Anno [] ary(byte @TestTypeAnnotations.Anno [] ary) {
-      return ary;// 113
+      return ary;// 117
    }
 
    public void varargs(@TestTypeAnnotations.Anno Object... args) {
-   }// 118
+   }// 122
 
    public void varargs(int v, @TestTypeAnnotations.Anno Object... args) {
-   }// 122
+   }// 126
 
    public void varargs2(Object @TestTypeAnnotations.Anno ... args) {
-   }// 126
+   }// 130
 
    public void varargs2(int v, Object @TestTypeAnnotations.Anno ... args) {
-   }// 130
+   }// 134
 
    public void varargs3a(Object[] @TestTypeAnnotations.Anno ... args) {
-   }// 134
+   }// 138
 
    public void varargs3b(Object @TestTypeAnnotations.Anno []... args) {
-   }// 138
+   }// 142
 
    @Target(ElementType.TYPE_USE)
    public @interface Anno {
@@ -91,6 +91,9 @@ public class TestTypeAnnotations {
       public [email protected] Inner.InnerInner ad;
       public [email protected] InnerInner ae;
 
+      public Inner(@TestTypeAnnotations.Anno String s, Object o, @TestTypeAnnotations.Anno String s2) {
+      }// 22
+
       public class InnerInner {
       }
 
@@ -120,6 +123,20 @@ public class TestTypeAnnotations {
       public static class Inner2Static {
       }
    }
+
+   public enum TestEnum {
+      A("a"),// 145
+      B("b"),// 146
+      C("c");// 147
+
+      TestEnum(@TestTypeAnnotations.Anno String name) {
+         this(name, name.charAt(0), 0, null);// 150
+      }// 151
+
+      TestEnum(@TestTypeAnnotations.Anno String name, char c, int i, @TestTypeAnnotations.Anno Object o) {
+         System.out.println(name + " " + c + i + " " + o);// 154
+      }// 155
+   }
 }
 
 class 'pkg/TestTypeAnnotations' {
@@ -178,16 +195,82 @@ class 'pkg/TestTypeAnnotations' {
    }
 }
 
+class 'pkg/TestTypeAnnotations$Inner' {
+   method '<init> (Lpkg/TestTypeAnnotations;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)V' {
+      4      94
+   }
+}
+
+class 'pkg/TestTypeAnnotations$TestEnum' {
+   method '<clinit> ()V' {
+      7      127
+      8      127
+      16      128
+      17      128
+      25      129
+      26      129
+   }
+
+   method '<init> (Ljava/lang/String;ILjava/lang/String;)V' {
+      3      132
+      4      132
+      5      132
+      6      132
+      7      132
+      8      132
+      9      132
+      a      132
+      b      132
+      c      132
+      d      132
+      e      133
+   }
+
+   method '<init> (Ljava/lang/String;ILjava/lang/String;CILjava/lang/Object;)V' {
+      6      136
+      7      136
+      8      136
+      9      136
+      a      136
+      b      136
+      c      136
+      d      136
+      e      136
+      f      136
+      13      136
+      14      136
+      15      136
+      16      136
+      17      136
+      18      136
+      19      136
+      1a      136
+      1b      137
+   }
+}
+
 Lines mapping:
-93 <-> 36
-97 <-> 40
-101 <-> 44
-105 <-> 48
-109 <-> 52
-113 <-> 56
-118 <-> 60
-122 <-> 63
-126 <-> 66
-130 <-> 69
-134 <-> 72
-138 <-> 75
+22 <-> 95
+97 <-> 36
+101 <-> 40
+105 <-> 44
+109 <-> 48
+113 <-> 52
+117 <-> 56
+122 <-> 60
+126 <-> 63
+130 <-> 66
+134 <-> 69
+138 <-> 72
+142 <-> 75
+145 <-> 128
+146 <-> 129
+147 <-> 130
+150 <-> 133
+151 <-> 134
+154 <-> 137
+155 <-> 138
+Not mapped:
+20
+144
+153

testData/src/java21/pkg/TestTypeAnnotations.java

@@ -17,6 +17,10 @@ public class Inner {
     public TestTypeAnnotations.@Anno Inner.InnerInner ad;
     public TestTypeAnnotations.Inner. @Anno InnerInner ae;
 
+    public Inner(@Anno String s, Object o, @Anno String s2) {
+
+    }
+
     public record InnerRec() {
       public static TestTypeAnnotations.Inner.@Anno InnerRec.A ba;
       public static TestTypeAnnotations.Inner.InnerRec.@Anno A bb;
@@ -136,4 +140,18 @@ public void varargs3a(Object[] @Anno ... args) {
   public void varargs3b(Object @Anno []... args) {
 
   }
+
+  public enum TestEnum {
+    A("a"),
+    B("b"),
+    C("c");
+
+    TestEnum(@Anno String name) {
+      this(name, name.charAt(0), 0, null);
+    }
+
+    TestEnum(@Anno String name, char c, int i, @Anno Object o) {
+      System.out.println(name + " " + c + i + " " + o);
+    }
+  }
 }