issue #138: fix compilation error when using injection within an inne…

…r class
f2prateek · Jan 4, 2017 · 13e34c5 · 13e34c5
1 parent 517198f
commit 13e34c5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/dart-common/src/main/java/com/f2prateek/dart/common/InjectionTarget.java b/dart-common/src/main/java/com/f2prateek/dart/common/InjectionTarget.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import javax.lang.model.type.TypeMirror;
 
-public final class InjectionTarget {
+public final class InjectionTarget implements Comparable<InjectionTarget> {
   public final Map<String, ExtraInjection> injectionMap = new LinkedHashMap<>();
   public final String classPackage;
   public final String className;
@@ -57,4 +57,10 @@ private ExtraInjection getOrCreateExtraBinding(String key) {
   public String getFqcn() {
     return classPackage + "." + className;
   }
+
+  @Override
+  public int compareTo(InjectionTarget o) {
+    if (o == null) return 0;
+    return -this.targetClass.compareTo(o.targetClass);
+  }
 }
diff --git a/...processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java b/...processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java
@@ -10,7 +10,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.TreeSet;
 import javax.lang.model.element.Modifier;
 
 /**
@@ -29,7 +29,7 @@ public class HensonNavigatorGenerator extends BaseGenerator {
   public static final String HENSON_NAVIGATOR_CLASS_NAME = "Henson";
   public static final String WITH_CONTEXT_SET_STATE_CLASS_NAME = "WithContextSetState";
   private String packageName;
-  private Collection<String> targetClassNames;
+  private Collection<InjectionTarget> targets;
 
   public HensonNavigatorGenerator(String packageName, Collection<InjectionTarget> targets) {
     if (packageName != null) {
@@ -38,7 +38,7 @@ public HensonNavigatorGenerator(String packageName, Collection<InjectionTarget>
       this.packageName = findCommonPackage(targets);
     }
 
-    this.targetClassNames = getClassNamesWhereHensonCanGoto(targets);
+    this.targets = getTargetsWhereHensonCanGoto(targets);
   }
 
   private String hensonNavigatorClassName() {
@@ -78,8 +78,8 @@ private void emitNavigationMethods(TypeSpec.Builder hensonNavigatorTypeBuilder)
         .addParameter(ClassName.get("android.content", "Context"), "context")
         .addStatement("this.context = context")
         .build());
-    for (String targetClassName : targetClassNames) {
-      emitNavigationMethod(withContextSetStateBuilder, targetClassName);
+    for (InjectionTarget target : targets) {
+      emitNavigationMethod(withContextSetStateBuilder, target);
     }
     hensonNavigatorTypeBuilder.addType(withContextSetStateBuilder.build());
   }
@@ -99,7 +99,10 @@ private void emitWith(TypeSpec.Builder builder) {
     builder.addMethod(gotoMethodBuilder.build());
   }
 
-  private void emitNavigationMethod(TypeSpec.Builder builder, String targetClassName) {
+  private void emitNavigationMethod(TypeSpec.Builder builder, InjectionTarget target) {
+    String targetClassName = target.targetClass;
+    targetClassName =
+            targetClassName.replace(target.className.replaceAll("\\$", "."), "") + target.className;
     TypeName intentBuilderClassName =
         ClassName.bestGuess(targetClassName + IntentBuilderGenerator.BUNDLE_BUILDER_SUFFIX);
     String simpleTargetClassName = targetClassName.substring(targetClassName.lastIndexOf('.') + 1);
@@ -147,13 +150,14 @@ private String findCommonPackage(String commonPackageName, String packageName) {
     return commonRoot;
   }
 
-  private Collection<String> getClassNamesWhereHensonCanGoto(Collection<InjectionTarget> targets) {
-    Collection<String> classNames = new HashSet<>();
+  private Collection<InjectionTarget> getTargetsWhereHensonCanGoto(
+          Collection<InjectionTarget> targets) {
+    Collection<InjectionTarget> canGotoTargets = new TreeSet<>();
     for (InjectionTarget injectionTarget : targets) {
       if (!injectionTarget.isAbstractTargetClass) {
-        classNames.add(injectionTarget.targetClass);
+        canGotoTargets.add(injectionTarget);
       }
     }
-    return classNames;
+    return canGotoTargets;
   }
 }
diff --git a/...n-processor/src/main/java/com/f2prateek/dart/henson/processor/IntentBuilderGenerator.java b/...n-processor/src/main/java/com/f2prateek/dart/henson/processor/IntentBuilderGenerator.java
@@ -86,10 +86,10 @@ private void emitConstructor(TypeSpec.Builder intentBuilderTypeBuilder) {
     if (usesReflection) {
         emitGetClassDynamically(intentBuilderTypeBuilder);
         constructorBuilder.addStatement("intent = new Intent(context, getClassDynamically($S))",
-            target.getFqcn());
+            target.getFqcn().replaceAll("\\$", "."));
     } else {
         constructorBuilder.addStatement("intent = new Intent(context, $L.class)",
-            target.className);
+            target.className.replaceAll("\\$", "."));
     }
     intentBuilderTypeBuilder.addMethod(constructorBuilder.build());
   }