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

[FIR] Map Class to KClass in java annotations

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-07-23 15:57:34 +03:00
committed by Mikhail Glukhikh
parent 282a295d43
commit b63257345b
10 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.fir.kt
Vendored
+2 -2
View File
@@ -12,11 +12,11 @@ public @interface A {
@A(*arrayOf("5", "6"), "7", y = 3) fun test3() {}
<!INAPPLICABLE_CANDIDATE!>@A("1", "2", "3", x = String::class, y = 4)<!> fun test4() {}
@A("1", "2", "3", x = String::class, y = 4) fun test4() {}
@A("4", y = 5) fun test5() {}
<!INAPPLICABLE_CANDIDATE!>@A(*arrayOf("5", "6"), "7", x = Any::class, y = 6)<!> fun test6() {}
@A(*arrayOf("5", "6"), "7", x = Any::class, y = 6) fun test6() {}
@A(y = 7) fun test7() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.fir.kt
Vendored
+3 -3
View File
@@ -15,11 +15,11 @@ public @interface A {
@A(*arrayOf("5", "6"), "7") fun test3() {}
<!INAPPLICABLE_CANDIDATE!>@A("1", "2", "3", x = String::class)<!> fun test4() {}
@A("1", "2", "3", x = String::class) fun test4() {}
@A("4", y = 2) fun test5() {}
<!INAPPLICABLE_CANDIDATE!>@A(*arrayOf("5", "6"), "7", x = Any::class, y = 3)<!> fun test6() {}
@A(*arrayOf("5", "6"), "7", x = Any::class, y = 3) fun test6() {}
@A() fun test7() {}
@@ -27,4 +27,4 @@ public @interface A {
<!INAPPLICABLE_CANDIDATE!>@A(x = Any::class, *arrayOf("5", "6"), "7", y = 3)<!> fun test9() {}
<!INAPPLICABLE_CANDIDATE!>@A(x = Any::class, value = ["5", "6"], "7", y = 3)<!> fun test10() {}
<!INAPPLICABLE_CANDIDATE!>@A(x = Any::class, value = ["5", "6", "7"], y = 3)<!> fun test11() {}
@A(x = Any::class, value = ["5", "6", "7"], y = 3) fun test11() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.fir.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// FILE: A.java
public @interface A {
Class<?> arg() default Integer.class;
int x() default 1;
B b();
}
// FILE: B.java
public @interface B {
Class<?> arg() default String.class;
int y() default 2;
}
// FILE: c.kt
@A(arg = String::class, b = B(y = 1)) class MyClass1
@A(b = B(y = 3)) class MyClass2
@A(arg = String::class, b = <!INAPPLICABLE_CANDIDATE!>B<!>(arg = Boolean::class)) class MyClass3
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FILE: A.java
public @interface A {
Class<?> arg() default Integer.class;