Kapt: Support import directive with aliases in "correctErrorTypes" mode (KT-21358)

2017-11-21 23:29:13 +09:00
parent c7645bcf03
commit 00bb38fbb1
5 changed files with 221 additions and 17 deletions
@@ -0,0 +1,26 @@
+// CORRECT_ERROR_TYPES
+// NO_VALIDATION
+
+@file:Suppress("ENUM_ENTRY_AS_TYPE", "UNRESOLVED_REFERENCE")
+import java.util.Date as MyDate
+import java.util.concurrent.TimeUnit as MyTimeUnit
+import java.util.concurrent.TimeUnit.MICROSECONDS as MyMicroseconds
+import a.b.ABC as MyABC
+import bcd as MyBCD
+
+class Test {
+    lateinit var date: MyDate
+    lateinit var timeUnit: MyTimeUnit
+    lateinit var microseconds: MyMicroseconds
+
+    lateinit var abc: MyABC
+    lateinit var bcd: MyBCD
+
+    class MyDate {
+        lateinit var date2: MyDate
+    }
+}
+
+class Test2 {
+    lateinit var date: MyDate
+}
@@ -0,0 +1,150 @@
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeUnit.MICROSECONDS;
+import a.b.ABC;
+
+@kotlin.Metadata()
+@kapt.internal.KaptMetadata()
+public final class Test {
+    @org.jetbrains.annotations.NotNull()
+    public Test.MyDate date;
+    @org.jetbrains.annotations.NotNull()
+    public java.util.concurrent.TimeUnit timeUnit;
+    @org.jetbrains.annotations.NotNull()
+    public java.util.concurrent.TimeUnit microseconds;
+    @org.jetbrains.annotations.NotNull()
+    public a.b.ABC abc;
+    @org.jetbrains.annotations.NotNull()
+    public bcd bcd;
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getDate()LTest$MyDate;")
+    public final Test.MyDate getDate() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setDate(LTest$MyDate;)V")
+    public final void setDate(@org.jetbrains.annotations.NotNull()
+    Test.MyDate p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getTimeUnit()Ljava/util/concurrent/TimeUnit;")
+    public final java.util.concurrent.TimeUnit getTimeUnit() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setTimeUnit(Ljava/util/concurrent/TimeUnit;)V")
+    public final void setTimeUnit(@org.jetbrains.annotations.NotNull()
+    java.util.concurrent.TimeUnit p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getMicroseconds()Ljava/util/concurrent/TimeUnit;")
+    public final java.util.concurrent.TimeUnit getMicroseconds() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setMicroseconds(Ljava/util/concurrent/TimeUnit;)V")
+    public final void setMicroseconds(@org.jetbrains.annotations.NotNull()
+    java.util.concurrent.TimeUnit p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getAbc()Lerror/NonExistentClass;")
+    public final a.b.ABC getAbc() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setAbc(Lerror/NonExistentClass;)V")
+    public final void setAbc(@org.jetbrains.annotations.NotNull()
+    a.b.ABC p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getBcd()Lerror/NonExistentClass;")
+    public final bcd getBcd() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setBcd(Lerror/NonExistentClass;)V")
+    public final void setBcd(@org.jetbrains.annotations.NotNull()
+    bcd p0) {
+    }
+
+    @kapt.internal.KaptSignature("<init>()V")
+    public Test() {
+        super();
+    }
+
+    @kotlin.Metadata()
+    public static final class MyDate {
+        @org.jetbrains.annotations.NotNull()
+        public Test.MyDate date2;
+
+        @org.jetbrains.annotations.NotNull()
+        @kapt.internal.KaptSignature("getDate2()LTest$MyDate;")
+        public final Test.MyDate getDate2() {
+            return null;
+        }
+
+        @kapt.internal.KaptSignature("setDate2(LTest$MyDate;)V")
+        public final void setDate2(@org.jetbrains.annotations.NotNull()
+        Test.MyDate p0) {
+        }
+
+        @kapt.internal.KaptSignature("<init>()V")
+        public MyDate() {
+            super();
+        }
+    }
+}
+
+////////////////////
+
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeUnit.MICROSECONDS;
+import a.b.ABC;
+
+@kotlin.Metadata()
+@kapt.internal.KaptMetadata()
+public final class Test2 {
+    @org.jetbrains.annotations.NotNull()
+    public java.util.Date date;
+
+    @org.jetbrains.annotations.NotNull()
+    @kapt.internal.KaptSignature("getDate()Ljava/util/Date;")
+    public final java.util.Date getDate() {
+        return null;
+    }
+
+    @kapt.internal.KaptSignature("setDate(Ljava/util/Date;)V")
+    public final void setDate(@org.jetbrains.annotations.NotNull()
+    java.util.Date p0) {
+    }
+
+    @kapt.internal.KaptSignature("<init>()V")
+    public Test2() {
+        super();
+    }
+}
+
+////////////////////
+
+package kapt.internal;
+
+public @interface KaptMetadata {
+
+    public java.lang.String value();
+}
+
+////////////////////
+
+package kapt.internal;
+
+public @interface KaptSignature {
+
+    public java.lang.String value();
+}