Fix: apply workaround for class names starting with $ (#22)

RikkaApps · Oct 27, 2023 · ef5d6a8 · ef5d6a8
1 parent ea3a0f9
commit ef5d6a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/refine/RefineFactory.java b/gradle-plugin/src/main/java/dev/rikka/tools/refine/RefineFactory.java
@@ -16,7 +16,7 @@ public abstract class RefineFactory implements AsmClassVisitorFactory<Instrument
     @Override
     @Nonnull
     public ClassVisitor createClassVisitor(final @Nonnull ClassContext classContext, final @Nonnull ClassVisitor classVisitor) {
-        return new ClassRemapper(classVisitor, new RefineRemapper(classContext));
+        return new ClassRemapper(getInstrumentationContext().getApiVersion().get(), classVisitor, new RefineRemapper(classContext)) {};
     }
 
     @Override

diff --git a/gradle-plugin/src/main/java/dev/rikka/tools/refine/RefineRemapper.java b/gradle-plugin/src/main/java/dev/rikka/tools/refine/RefineRemapper.java
@@ -29,4 +29,15 @@ public String map(final String typeName) {
 
         return typeName;
     }
+
+    @Override
+    public String mapInnerClassName(String name, String ownerName, String innerName) {
+        final String result = super.mapInnerClassName(name, ownerName, innerName);
+
+        if (innerName.startsWith("$") && !result.startsWith("$")) {
+            return "$" + result;
+        }
+
+        return result;
+    }
 }