Kapt3: Replace error/NonExistentClass with the actual type (from PSI) (KT-15421)

plugins/kapt3/testData/converter/nonExistentClass.kt

@@ -1,4 +1,5 @@
 // NON_EXISTENT_CLASS
+// NO_VALIDATION
 
 @Suppress("UNRESOLVED_REFERENCE")
 object NonExistentType {

plugins/kapt3/testData/converter/nonExistentClass.txt

@@ -1,32 +1,32 @@
 @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
 public final class NonExistentType {
-    private static final error.NonExistentClass a = null;
-    private static final java.util.List<error.NonExistentClass> b = null;
-    private static final kotlin.jvm.functions.Function1<error.NonExistentClass, kotlin.Unit> c = null;
-    private static final error.NonExistentClass d = null;
+    private static final ABCDEF a = null;
+    private static final List<ABCDEF> b = null;
+    private static final Function1<ABCDEF, kotlin.Unit> c = null;
+    private static final ABCDEF<java.lang.String, Function1<List<ABCDEF>, kotlin.Unit>> d = null;
     public static final NonExistentType INSTANCE = null;
 
-    public final error.NonExistentClass getA() {
+    public final ABCDEF getA() {
         return null;
     }
 
-    public final java.util.List<error.NonExistentClass> getB() {
+    public final List<ABCDEF> getB() {
         return null;
     }
 
-    public final kotlin.jvm.functions.Function1<error.NonExistentClass, kotlin.Unit> getC() {
+    public final Function1<ABCDEF, kotlin.Unit> getC() {
         return null;
     }
 
-    public final error.NonExistentClass getD() {
+    public final ABCDEF<java.lang.String, Function1<List<ABCDEF>, kotlin.Unit>> getD() {
         return null;
     }
 
-    public final error.NonExistentClass a(error.NonExistentClass a, java.lang.String s) {
+    public final ABCDEF a(ABCDEF a, java.lang.String s) {
         return null;
     }
 
-    public final error.NonExistentClass b(java.lang.String s) {
+    public final ABCDEF b(java.lang.String s) {
         return null;
     }
 
@@ -40,8 +40,4 @@ public final class NonExistentType {
 package error;
 
 public final class NonExistentClass {
-
-    public NonExistentClass() {
-        super();
-    }
 }

plugins/kapt3/testData/converter/nonExistentClassTypesConversion.kt

@@ -0,0 +1,34 @@
+// NON_EXISTENT_CLASS
+// NO_VALIDATION
+
+@Suppress("UNRESOLVED_REFERENCE")
+class Test {
+    lateinit var a: ABC
+    val b: ABC? = null
+    val c: List<ABC>? = null
+    val d: List<Map<BCD, ABC<List<BCD>>>>? = null
+    lateinit var e: List<out Map<out ABC, out BCD>?>
+    lateinit var f: ABC<*>
+    lateinit var g: List<*>
+    lateinit var h: ABC<Int, String>
+    lateinit var i: (ABC, List<BCD>) -> CDE
+    lateinit var j: () -> CDE
+    lateinit var k: ABC.(List<BCD>) -> CDE
+
+    lateinit var l: ABC.BCD.EFG
+
+    val m = ABC()
+    val n = "".toString()
+
+    fun f1(a: ABC): BCD? {
+        return null
+    }
+
+    fun <T> f2(a: ABC<String, Int, () -> BCD>) {}
+
+    fun <T> f3(a: ABC, b: Int): Long {
+        return 0
+    }
+
+    fun f4() = ABC()
+}

plugins/kapt3/testData/converter/nonExistentClassTypesConversion.txt

@@ -0,0 +1,126 @@
+@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
+public final class Test {
+    public ABC a;
+    private final ABC b = null;
+    private final List<ABC> c = null;
+    private final List<Map<BCD, ABC<List<BCD>>>> d = null;
+    public List<? extends Map<? extends ABC, ? extends BCD>> e;
+    public ABC<?> f;
+    public java.util.List<?> g;
+    public ABC<java.lang.Integer, java.lang.String> h;
+    public Function2<ABC, List<BCD>, CDE> i;
+    public Function0<CDE> j;
+    public Function2<ABC, List<BCD>, CDE> k;
+    public ABC.BCD.EFG l;
+    private final error.NonExistentClass m = null;
+    private final java.lang.String n = "";
+
+    public final ABC getA() {
+        return null;
+    }
+
+    public final void setA(ABC p0) {
+    }
+
+    public final ABC getB() {
+        return null;
+    }
+
+    public final List<ABC> getC() {
+        return null;
+    }
+
+    public final List<Map<BCD, ABC<List<BCD>>>> getD() {
+        return null;
+    }
+
+    public final List<? extends Map<? extends ABC, ? extends BCD>> getE() {
+        return null;
+    }
+
+    public final void setE(List<? extends Map<? extends ABC, ? extends BCD>> p0) {
+    }
+
+    public final ABC<?> getF() {
+        return null;
+    }
+
+    public final void setF(ABC<?> p0) {
+    }
+
+    public final java.util.List<?> getG() {
+        return null;
+    }
+
+    public final void setG(java.util.List<?> p0) {
+    }
+
+    public final ABC<java.lang.Integer, java.lang.String> getH() {
+        return null;
+    }
+
+    public final void setH(ABC<java.lang.Integer, java.lang.String> p0) {
+    }
+
+    public final Function2<ABC, List<BCD>, CDE> getI() {
+        return null;
+    }
+
+    public final void setI(Function2<ABC, List<BCD>, CDE> p0) {
+    }
+
+    public final Function0<CDE> getJ() {
+        return null;
+    }
+
+    public final void setJ(Function0<CDE> p0) {
+    }
+
+    public final Function2<ABC, List<BCD>, CDE> getK() {
+        return null;
+    }
+
+    public final void setK(Function2<ABC, List<BCD>, CDE> p0) {
+    }
+
+    public final ABC.BCD.EFG getL() {
+        return null;
+    }
+
+    public final void setL(ABC.BCD.EFG p0) {
+    }
+
+    public final error.NonExistentClass getM() {
+        return null;
+    }
+
+    public final java.lang.String getN() {
+        return null;
+    }
+
+    public final BCD f1(ABC a) {
+        return null;
+    }
+
+    public final <T extends java.lang.Object>void f2(ABC<java.lang.String, java.lang.Integer, Function0<BCD>> a) {
+    }
+
+    public final <T extends java.lang.Object>long f3(ABC a, int b) {
+        return 0L;
+    }
+
+    public final error.NonExistentClass f4() {
+        return null;
+    }
+
+    public Test() {
+        super();
+    }
+}
+
+////////////////////
+
+package error;
+
+public final class NonExistentClass {
+}