Fix search of annotated type parameters in imports

1 files changed, 22 insertions, 0 deletions

diff --git a/src/test/java/com/squareup/javapoet/JavaFileTest.java b/src/test/java/com/squareup/javapoet/JavaFileTest.java
index ee7fca8..e056116 100644
--- a/src/test/java/com/squareup/javapoet/JavaFileTest.java
+++ b/src/test/java/com/squareup/javapoet/JavaFileTest.java
@@ -17,6 +17,7 @@ package com.squareup.javapoet;
 
 import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.lang.model.element.Modifier;
 import org.junit.Ignore;
@@ -290,6 +291,27 @@ public final class JavaFileTest {
         + "}\n");
   }
 
+  @Test public void annotatedTypeParam() throws Exception {
+    String source = JavaFile.builder("com.squareup.tacos",
+        TypeSpec.classBuilder("Taco")
+            .addField(ParameterizedTypeName.get(ClassName.get(List.class),
+                ClassName.get("com.squareup.meat", "Chorizo")
+                    .annotated(AnnotationSpec.builder(ClassName.get("com.squareup.tacos", "Spicy"))
+                        .build())), "chorizo")
+            .build())
+        .build()
+        .toString();
+    assertThat(source).isEqualTo(""
+        + "package com.squareup.tacos;\n"
+        + "\n"
+        + "import com.squareup.meat.Chorizo;\n"
+        + "import java.util.List;\n"
+        + "\n"
+        + "class Taco {\n"
+        + "  List<@Spicy Chorizo> chorizo;\n"
+        + "}\n");
+  }
+
   @Test public void skipJavaLangImportsWithConflictingClassLast() throws Exception {
     // Whatever is used first wins! In this case the Float in java.lang is imported.
     String source = JavaFile.builder("com.squareup.tacos",