Kapt3: Use annotation simple name if the annotation declaration is inside the same package as the current source file's package

plugins/kapt3/testData/converter/annotations2.kt

@@ -3,8 +3,7 @@ package test
 
 @Anno("anno-class")
 annotation class Anno @Anno("anno-constructor") constructor(
-        @Anno("anno-value") val value: String,
-        val anno: Anno = Anno("anno-default")
+        @Anno("anno-value") val value: String
 )
 
 @Anno("clazz")

plugins/kapt3/testData/converter/annotations2.txt

@@ -0,0 +1,78 @@
+package test;
+
+@Anno(value = "anno-class")
+public abstract @interface Anno {
+
+    public abstract java.lang.String value();
+}
+
+////////////////////
+
+package test;
+
+@Anno(value = "clazz")
+public abstract class Test {
+    private java.lang.String v;
+
+    @Anno(value = "abstract-method")
+    public abstract java.lang.String abstractMethod();
+
+    public abstract java.lang.String getAbstractVal();
+
+    @Anno(value = "v-get")
+    public final java.lang.String getV() {
+        return null;
+    }
+
+    @Anno(value = "v-set")
+    public final void setV(@Anno(value = "v-setparam")
+    java.lang.String p0) {
+    }
+
+    @Anno(value = "test-constructor")
+    protected Test(@Anno(value = "v-param")
+    java.lang.String v) {
+        super();
+    }
+}
+
+////////////////////
+
+package test;
+
+@Anno(value = "enum")
+public enum Enum {
+    /*public static final*/ WHITE /* = null */,
+    /*public static final*/ BLACK /* = null */;
+    private final int x = 0;
+
+    public final int getX() {
+        return 0;
+    }
+
+    @Anno(value = "enum-constructor")
+    Enum(@Anno(value = "x")
+    int x) {
+    }
+}
+
+////////////////////
+
+package test;
+
+public final class test {
+
+    public test() {
+        super();
+    }
+
+    @Anno(value = "top-level-fun")
+    public static final void topLevelFun(@Anno(value = "top-level-fun-receiver")
+    java.lang.String $receiver) {
+    }
+
+    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
+    int $receiver) {
+        return null;
+    }
+}

plugins/kapt3/testData/converter/topLevel.txt

@@ -32,19 +32,19 @@ public final class another {
         return null;
     }
 
-    public static final void extensionFunction(@test.another.Anno(value = "rec")
-    java.lang.String $receiver, @test.another.Anno(value = "1")
-    java.lang.String a, @test.another.Anno(value = "2")
+    public static final void extensionFunction(@Anno(value = "rec")
+    java.lang.String $receiver, @Anno(value = "1")
+    java.lang.String a, @Anno(value = "2")
     java.lang.String b) {
     }
 
-    public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@test.another.Anno(value = "propRec")
+    public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@Anno(value = "propRec")
     T $receiver) {
         return null;
     }
 
-    public static final <T extends java.lang.Object>void setExtensionProperty(@test.another.Anno(value = "propRec")
-    T $receiver, @test.another.Anno(value = "setparam")
+    public static final <T extends java.lang.Object>void setExtensionProperty(@Anno(value = "propRec")
+    T $receiver, @Anno(value = "setparam")
     java.lang.String setParamName) {
     }
 }