Resolve inner classes from byte code in source code (#10)

Author: LunNova

src/main/java/org/minimallycorrect/javatransformer/internal/ResolutionContext.java

@@ -246,10 +246,16 @@ private Type resolveClassType(String name) {
 			// inner class in imported class
 			if (preDotName != null && importName.endsWith(preDotName)) {
 				String fullName = importName + postDotName;
+				// TODO: we can either resolve with $ or . here depending on if in source or byte code
+				// should make consistent by always using $ for inner class names
 				Type type = resolveIfExists(fullName);
 				if (type != null) {
 					return type;
 				}
+				type = resolveIfExists(importName + postDotName.replace('.', '$'));
+				if (type != null) {
+					return type;
+				}
 			}
 		}
 

src/main/java/org/minimallycorrect/javatransformer/internal/util/JVMUtil.java

@@ -137,6 +137,9 @@ public static int accessStringToInt(String access) {
 				case "synthetic":
 					a |= AccessFlags.ACC_SYNTHETIC;
 					break;
+				case "final":
+					a |= AccessFlags.ACC_FINAL;
+					break;
 				default:
 					throw new TransformationException("Unknown access string " + access);
 			}

src/test/java/org/minimallycorrect/javatransformer/api/JavaTransformerTest.java

@@ -93,7 +93,7 @@ public void testTransform() throws Exception {
 			c.getMembers().collect(Collectors.toList());
 			c.getConstructors().collect(Collectors.toList());
 			c.getMethods().forEach(it -> {
-				it.getReturnType();
+				val rt = it.getReturnType();
 
 				val cf = it.getCodeFragment();
 

src/test/java/org/minimallycorrect/javatransformer/transform/AnnotationInnerClassExample.java

@@ -0,0 +1,8 @@
+package org.minimallycorrect.javatransformer.transform;
+
+public @interface AnnotationInnerClassExample {
+	enum TestEnum {
+		ONE,
+		TWO
+	}
+}

src/test/java/org/minimallycorrect/javatransformer/transform/InnerClassReferencer.java

@@ -1,5 +1,7 @@
 package org.minimallycorrect.javatransformer.transform;
 
+import java.lang.invoke.MethodHandles;
+
 public class InnerClassReferencer {
 	public InnerClassExample.Inner test1() {
 		throw new UnsupportedOperationException();
@@ -8,4 +10,20 @@ public InnerClassExample.Inner test1() {
 	public org.minimallycorrect.javatransformer.transform.InnerClassExample.Inner2 test2() {
 		throw new UnsupportedOperationException();
 	}
+
+	public AnnotationInnerClassExample.TestEnum test3() {
+		throw new UnsupportedOperationException();
+	}
+
+	public org.minimallycorrect.javatransformer.transform.AnnotationInnerClassExample.TestEnum test4() {
+		throw new UnsupportedOperationException();
+	}
+
+	public MethodHandles.Lookup test5() {
+		throw new UnsupportedOperationException();
+	}
+
+	public java.lang.invoke.MethodHandles.Lookup test6() {
+		throw new UnsupportedOperationException();
+	}
 }