azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kapt: Support type aliases in correctErrorTypes mode (KT-19402)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-11-07 12:02:37 +09:00
parent 84e5fa38bb
commit 5efdf111f5
9 changed files with 411 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt
Vendored
+2 -2
View File
@@ -8,7 +8,7 @@ public final class NonExistentType {
@org.jetbrains.annotations.NotNull()
private static final Function1<ABCDEF, kotlin.Unit> c = null;
@org.jetbrains.annotations.Nullable()
private static final ABCDEF<java.lang.String, ? extends Function1<java.util.List<ABCDEF>, kotlin.Unit>> d = null;
private static final ABCDEF<java.lang.String, Function1<java.util.List<ABCDEF>, kotlin.Unit>> d = null;
public static final NonExistentType INSTANCE = null;
@org.jetbrains.annotations.Nullable()
@@ -27,7 +27,7 @@ public final class NonExistentType {
}
@org.jetbrains.annotations.Nullable()
public final ABCDEF<java.lang.String, ? extends Function1<java.util.List<ABCDEF>, kotlin.Unit>> getD() {
public final ABCDEF<java.lang.String, Function1<java.util.List<ABCDEF>, kotlin.Unit>> getD() {
return null;
}
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.kt
Vendored
+17 -2
View File
@@ -3,12 +3,19 @@
// NO_VALIDATION
// WITH_RUNTIME
@file:Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_PARAMETER_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION", "UNSUPPORTED_FEATURE")
import java.util.Calendar
import kotlin.reflect.KClass
@Suppress("UNRESOLVED_REFERENCE", "ANNOTATION_PARAMETER_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION", "UNSUPPORTED_FEATURE")
typealias Coocoo = ABC
typealias Coocoo2<T> = ABC<T>
typealias Coocoo3<X> = ABC<String, X>
typealias Nested1 = ABC
typealias Nested2 = Nested1
@Anno(Blah::class, arrayOf(NoFoo1::class, NoBar1::class), [NoFoo2::class, String::class], Boolean::class, NoBar3::class)
class Test {
class Test<G> {
lateinit var a: ABC
val b: ABC? = null
val c: List<ABC>? = null
@@ -23,6 +30,14 @@ class Test {
lateinit var l: ABC.BCD.EFG
lateinit var coocoo: Coocoo
lateinit var coocoo2: Coocoo2<String>
lateinit var coocoo21: Coocoo2<Coocoo>
lateinit var coocoo3: Coocoo3<String>
lateinit var coocoo31: Coocoo3<Coocoo2<Coocoo>>
lateinit var nested: Nested2
val m = ABC()
val n = "".toString()
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
Vendored
+86 -10
View File
@@ -35,9 +35,19 @@ import java.util.Calendar;
import kotlin.reflect.KClass;
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE", "ANNOTATION_PARAMETER_MUST_BE_CONST", "NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION", "UNSUPPORTED_FEATURE"})
@kotlin.Metadata()
public final class NonExistentClassTypesConversionKt {
}
////////////////////
import java.util.Calendar;
import kotlin.reflect.KClass;
@kotlin.Metadata()
@Anno(a = Blah.class, b = {NoFoo1.class, NoBar1.class}, c = {NoFoo2.class, String.class}, d = {Boolean.class, NoBar3.class})
public final class Test {
public final class Test<G extends java.lang.Object> {
@org.jetbrains.annotations.NotNull()
public ABC a;
@org.jetbrains.annotations.Nullable()
@@ -45,9 +55,9 @@ public final class Test {
@org.jetbrains.annotations.Nullable()
private final java.util.List<ABC> c = null;
@org.jetbrains.annotations.Nullable()
private final java.util.List<java.util.Map<BCD, ABC<? extends java.util.List<BCD>>>> d = null;
private final java.util.List<java.util.Map<BCD, ABC<java.util.List<BCD>>>> d = null;
@org.jetbrains.annotations.NotNull()
public java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> e;
public java.util.List<java.util.Map<? extends ABC, BCD>> e;
@org.jetbrains.annotations.NotNull()
public ABC<?> f;
@org.jetbrains.annotations.NotNull()
@@ -63,13 +73,25 @@ public final class Test {
@org.jetbrains.annotations.NotNull()
public ABC.BCD.EFG l;
@org.jetbrains.annotations.NotNull()
public ABC coocoo;
@org.jetbrains.annotations.NotNull()
public ABC<java.lang.String> coocoo2;
@org.jetbrains.annotations.NotNull()
public ABC<ABC> coocoo21;
@org.jetbrains.annotations.NotNull()
public ABC<java.lang.String, java.lang.String> coocoo3;
@org.jetbrains.annotations.NotNull()
public ABC<java.lang.String, ABC<ABC>> coocoo31;
@org.jetbrains.annotations.NotNull()
public ABC nested;
@org.jetbrains.annotations.NotNull()
private final error.NonExistentClass m = null;
@org.jetbrains.annotations.NotNull()
private final java.lang.String n = "";
@org.jetbrains.annotations.NotNull()
public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> o11;
@org.jetbrains.annotations.NotNull()
public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> o10;
public java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<ABC>>>>>>>>> o10;
@org.jetbrains.annotations.NotNull()
public java.util.Calendar.Builder p;
@@ -93,12 +115,12 @@ public final class Test {
}
@org.jetbrains.annotations.Nullable()
public final java.util.List<java.util.Map<BCD, ABC<? extends java.util.List<BCD>>>> getD() {
public final java.util.List<java.util.Map<BCD, ABC<java.util.List<BCD>>>> getD() {
return null;
}
@org.jetbrains.annotations.NotNull()
public final java.util.List<? extends java.util.Map<? extends ABC, ? extends BCD>> getE() {
public final java.util.List<java.util.Map<? extends ABC, BCD>> getE() {
return null;
}
@@ -139,7 +161,7 @@ public final class Test {
}
public final void setI(@org.jetbrains.annotations.NotNull()
Function2<ABC, java.util.List<BCD>, CDE> p0) {
Function2<ABC, java.util.List<? extends BCD>, CDE> p0) {
}
@org.jetbrains.annotations.NotNull()
@@ -157,7 +179,7 @@ public final class Test {
}
public final void setK(@org.jetbrains.annotations.NotNull()
Function2<ABC, java.util.List<BCD>, CDE> p0) {
Function2<ABC, java.util.List<? extends BCD>, CDE> p0) {
}
@org.jetbrains.annotations.NotNull()
@@ -169,6 +191,60 @@ public final class Test {
ABC.BCD.EFG p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC getCoocoo() {
return null;
}
public final void setCoocoo(@org.jetbrains.annotations.NotNull()
ABC p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC<java.lang.String> getCoocoo2() {
return null;
}
public final void setCoocoo2(@org.jetbrains.annotations.NotNull()
ABC<java.lang.String> p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC<ABC> getCoocoo21() {
return null;
}
public final void setCoocoo21(@org.jetbrains.annotations.NotNull()
ABC<ABC> p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC<java.lang.String, java.lang.String> getCoocoo3() {
return null;
}
public final void setCoocoo3(@org.jetbrains.annotations.NotNull()
ABC<java.lang.String, java.lang.String> p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC<java.lang.String, ABC<ABC>> getCoocoo31() {
return null;
}
public final void setCoocoo31(@org.jetbrains.annotations.NotNull()
ABC<java.lang.String, ABC<ABC>> p0) {
}
@org.jetbrains.annotations.NotNull()
public final ABC getNested() {
return null;
}
public final void setNested(@org.jetbrains.annotations.NotNull()
ABC p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getM() {
return null;
@@ -189,12 +265,12 @@ public final class Test {
}
@org.jetbrains.annotations.NotNull()
public final java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> getO10() {
public final java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<ABC>>>>>>>>> getO10() {
return null;
}
public final void setO10(@org.jetbrains.annotations.NotNull()
java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<ABC>>>>>>>>> p0) {
java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends ABC>>>>>>>>> p0) {
}
@org.jetbrains.annotations.NotNull()
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.kt
Vendored
+15 -1
View File
@@ -1,13 +1,27 @@
// NON_EXISTENT_CLASS
// NO_VALIDATION
@Suppress("UNRESOLVED_REFERENCE")
@file:Suppress("UNRESOLVED_REFERENCE")
typealias String2 = String
typealias Coocoo = ABC
typealias Coocoo2<T> = ABC<T>
typealias Coocoo3<X> = ABC<String, X>
object NonExistentType {
val a: ABCDEF? = null
val b: List<ABCDEF>? = null
val c: (ABCDEF) -> Unit = { f -> }
val d: ABCDEF<String, (List<ABCDEF>) -> Unit>? = null
lateinit var string2: String2
lateinit var coocoo: Coocoo
lateinit var coocoo2: Coocoo2<String>
lateinit var coocoo21: Coocoo2<Coocoo>
lateinit var coocoo3: Coocoo3<String>
lateinit var coocoo31: Coocoo3<Coocoo2<Coocoo>>
fun a(a: ABCDEF, s: String): ABCDEF {}
fun b(s: String): ABCDEF {}
}
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt
Vendored
+73
View File
@@ -1,4 +1,11 @@
@kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
@kotlin.Metadata()
public final class NonExistentClassWIthoutCorrectionKt {
}
////////////////////
@kotlin.Metadata()
public final class NonExistentType {
@org.jetbrains.annotations.Nullable()
@@ -9,6 +16,18 @@ public final class NonExistentType {
private static final kotlin.jvm.functions.Function1<error.NonExistentClass, kotlin.Unit> c = null;
@org.jetbrains.annotations.Nullable()
private static final error.NonExistentClass d = null;
@org.jetbrains.annotations.NotNull()
public static java.lang.String string2;
@org.jetbrains.annotations.NotNull()
public static error.NonExistentClass coocoo;
@org.jetbrains.annotations.NotNull()
public static error.NonExistentClass coocoo2;
@org.jetbrains.annotations.NotNull()
public static error.NonExistentClass coocoo21;
@org.jetbrains.annotations.NotNull()
public static error.NonExistentClass coocoo3;
@org.jetbrains.annotations.NotNull()
public static error.NonExistentClass coocoo31;
public static final NonExistentType INSTANCE = null;
@org.jetbrains.annotations.Nullable()
@@ -31,6 +50,60 @@ public final class NonExistentType {
return null;
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String getString2() {
return null;
}
public final void setString2(@org.jetbrains.annotations.NotNull()
java.lang.String p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getCoocoo() {
return null;
}
public final void setCoocoo(@org.jetbrains.annotations.NotNull()
error.NonExistentClass p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getCoocoo2() {
return null;
}
public final void setCoocoo2(@org.jetbrains.annotations.NotNull()
error.NonExistentClass p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getCoocoo21() {
return null;
}
public final void setCoocoo21(@org.jetbrains.annotations.NotNull()
error.NonExistentClass p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getCoocoo3() {
return null;
}
public final void setCoocoo3(@org.jetbrains.annotations.NotNull()
error.NonExistentClass p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass getCoocoo31() {
return null;
}
public final void setCoocoo31(@org.jetbrains.annotations.NotNull()
error.NonExistentClass p0) {
}
@org.jetbrains.annotations.NotNull()
public final error.NonExistentClass a(@org.jetbrains.annotations.NotNull()
error.NonExistentClass a, @org.jetbrains.annotations.NotNull()