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

[FIR] Support several annotation class diagnostics

Browse Source
This commit is contained in:
Mikhail Likholetov
2020-05-20 21:40:24 +03:00
committed by Mikhail Glukhikh
parent c112d37ac1
commit 80cd26c9df
11 changed files with 223 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.fir.kt
Vendored
+22 -22
View File
@@ -25,11 +25,11 @@ annotation class Ann4(val p1: IntArray,
annotation class Ann5(val p1: MyEnum)
annotation class Ann6(val p: Class<*>)
annotation class Ann6(val p: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Class<*><!>)
annotation class Ann7(val p: RetentionPolicy)
annotation class Ann8(val p1: Array<String>,
val p2: Array<Class<*>>,
val p2: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<Class<*>><!>,
val p3: Array<MyEnum>,
val p4: Array<Ann1>)
@@ -39,32 +39,32 @@ annotation class Ann9(
// INCORRECT
annotation class InAnn1(val p1: Int?,
val p3: Short?,
val p4: Long?,
val p5: Double?,
val p6: Float?,
val p7: Char?,
val p8: Boolean?)
annotation class InAnn1(val p1: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Int?<!>,
val p3: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Short?<!>,
val p4: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Long?<!>,
val p5: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Double?<!>,
val p6: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Float?<!>,
val p7: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Char?<!>,
val p8: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Boolean?<!>)
annotation class InAnn4(val p1: Array<Int>,
val p2: Array<Int>?)
annotation class InAnn4(val p1: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<Int><!>,
val p2: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Array<Int>?<!>)
annotation class InAnn6(val p: Class<*>?)
annotation class InAnn7(val p: RetentionPolicy?)
annotation class InAnn8(val p1: Array<Int>,
val p2: Array<Int?>,
val p3: Array<MyClass>,
val p4: Array<IntArray>)
annotation class InAnn6(val p: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Class<*>?<!>)
annotation class InAnn7(val p: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>RetentionPolicy?<!>)
annotation class InAnn8(val p1: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<Int><!>,
val p2: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<Int?><!>,
val p3: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<MyClass><!>,
val p4: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<IntArray><!>)
annotation class InAnn9(val p: MyClass)
annotation class InAnn9(val p: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>MyClass<!>)
annotation class InAnn10(val p1: String?)
annotation class InAnn11(val p1: Ann1?)
annotation class InAnn12(val p1: MyEnum?)
annotation class InAnn10(val p1: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>String?<!>)
annotation class InAnn11(val p1: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>Ann1?<!>)
annotation class InAnn12(val p1: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>MyEnum?<!>)
annotation class InAnn13(vararg val p1: String,
vararg val p2: Class<*>,
vararg val p2: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Class<*><!>,
vararg val p3: MyEnum,
vararg val p4: Ann1,
vararg val p5: Int)
compiler/testData/diagnostics/tests/inlineClasses/inlineClassesInsideAnnotations.fir.kt
Vendored
+3 -3
View File
@@ -5,8 +5,8 @@ import kotlin.reflect.KClass
inline class MyInt(val x: Int)
inline class MyString(val x: String)
annotation class Ann1(val a: MyInt)
annotation class Ann2(val a: Array<MyString>)
annotation class Ann3(vararg val a: MyInt)
annotation class Ann1(val a: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>MyInt<!>)
annotation class Ann2(val a: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Array<MyString><!>)
annotation class Ann3(vararg val a: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>MyInt<!>)
annotation class Ann4(val a: KClass<MyInt>)
compiler/testData/diagnostics/tests/inlineClasses/varargsOnParametersOfInlineClassType.fir.kt
Vendored
+1 -1
View File
@@ -18,4 +18,4 @@ class B(vararg val s: Foo) {
constructor(a: Int, vararg s: Foo) : this(*s)
}
annotation class Ann(vararg val f: Foo)
annotation class Ann(vararg val f: <!INVALID_TYPE_OF_ANNOTATION_MEMBER!>Foo<!>)