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

[FIR] Fix tests (ARGUMENT_TYPE_MISMATCH instead of INCOMPATIBLE_CANDIDATE)

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-04-06 01:35:30 +03:00
committed by TeamCityServer
parent 4ffab5fe5a
commit ad9b962536
461 changed files with 1239 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.fir.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ annotation class Ann(val i: IntArray)
@Ann(intArrayOf(i2))
@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>intArrayOf(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i3<!>)<!>)
@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>intArrayOf(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i<!>, i2, <!ANNOTATION_ARGUMENT_MUST_BE_CONST!>i3<!>)<!>)
@Ann(<!INAPPLICABLE_CANDIDATE!>intArrayOf<!>(intArrayOf(i, i2, i3)))
@Ann(intArrayOf(<!ARGUMENT_TYPE_MISMATCH!>intArrayOf(i, i2, i3)<!>))
class Test
var i = 1
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.fir.kt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ public @interface A {
}
// FILE: b.kt
<!INAPPLICABLE_CANDIDATE!>@A(*arrayOf(1, "b"))<!>
@A(*<!ARGUMENT_TYPE_MISMATCH!>arrayOf(1, "b")<!>)
fun test() {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.fir.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@
annotation class B(vararg val args: String)
<!INAPPLICABLE_CANDIDATE!>@B(*arrayOf(1, "b"))<!>
@B(*<!ARGUMENT_TYPE_MISMATCH!>arrayOf(1, "b")<!>)
fun test() {
}
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.fir.kt
Vendored
+2 -2
View File
@@ -14,7 +14,7 @@ class MyClass1
@Ann1(arrayOf(Any::class))
class MyClass1a
<!INAPPLICABLE_CANDIDATE!>@Ann1(arrayOf(B1::class))<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>arrayOf(B1::class)<!>)
class MyClass2
annotation class Ann2(val arg: Array<KClass<in B1>>)
@@ -25,5 +25,5 @@ class MyClass3
@Ann2(arrayOf(B1::class))
class MyClass4
<!INAPPLICABLE_CANDIDATE!>@Ann2(arrayOf(B2::class))<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>arrayOf(B2::class)<!>)
class MyClass5
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.fir.kt
Vendored
+3 -3
View File
@@ -11,7 +11,7 @@ annotation class Ann1(val arg: Array<KClass<out A>>)
@Ann1(arrayOf(A::class))
class MyClass1
<!INAPPLICABLE_CANDIDATE!>@Ann1(arrayOf(Any::class))<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>arrayOf(Any::class)<!>)
class MyClass1a
@Ann1(arrayOf(B1::class))
@@ -19,11 +19,11 @@ class MyClass2
annotation class Ann2(val arg: Array<KClass<out B1>>)
<!INAPPLICABLE_CANDIDATE!>@Ann2(arrayOf(A::class))<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>arrayOf(A::class)<!>)
class MyClass3
@Ann2(arrayOf(B1::class))
class MyClass4
<!INAPPLICABLE_CANDIDATE!>@Ann2(arrayOf(B2::class))<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>arrayOf(B2::class)<!>)
class MyClass5
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsInVariance.fir.kt
Vendored
+2 -2
View File
@@ -12,7 +12,7 @@ class MyClass1
@Ann1(Any::class)
class MyClass1a
<!INAPPLICABLE_CANDIDATE!>@Ann1(B1::class)<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>B1::class<!>)
class MyClass2
annotation class Ann2(val arg: KClass<in B1>)
@@ -23,5 +23,5 @@ class MyClass3
@Ann2(B1::class)
class MyClass4
<!INAPPLICABLE_CANDIDATE!>@Ann2(B2::class)<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>B2::class<!>)
class MyClass5
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInAnnotationsOutVariance.fir.kt
Vendored
+3 -3
View File
@@ -9,7 +9,7 @@ annotation class Ann1(val arg: KClass<out A>)
@Ann1(A::class)
class MyClass1
<!INAPPLICABLE_CANDIDATE!>@Ann1(Any::class)<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>Any::class<!>)
class MyClass1a
@Ann1(B1::class)
@@ -17,11 +17,11 @@ class MyClass2
annotation class Ann2(val arg: KClass<out B1>)
<!INAPPLICABLE_CANDIDATE!>@Ann2(A::class)<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>A::class<!>)
class MyClass3
@Ann2(B1::class)
class MyClass4
<!INAPPLICABLE_CANDIDATE!>@Ann2(B2::class)<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>B2::class<!>)
class MyClass5
compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassInvariantTP.fir.kt
Vendored
+3 -3
View File
@@ -8,15 +8,15 @@ annotation class Ann1(val arg: KClass<A>)
@Ann1(A::class)
class MyClass1
<!INAPPLICABLE_CANDIDATE!>@Ann1(Any::class)<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>Any::class<!>)
class MyClass1a
<!INAPPLICABLE_CANDIDATE!>@Ann1(B::class)<!>
@Ann1(<!ARGUMENT_TYPE_MISMATCH!>B::class<!>)
class MyClass2
annotation class Ann2(val arg: KClass<B>)
<!INAPPLICABLE_CANDIDATE!>@Ann2(A::class)<!>
@Ann2(<!ARGUMENT_TYPE_MISMATCH!>A::class<!>)
class MyClass3
@Ann2(B::class)
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.fir.kt
Vendored
+3 -3
View File
@@ -6,8 +6,8 @@ public @interface A {
}
// FILE: b.kt
<!INAPPLICABLE_CANDIDATE!>@A(false,
@A(<!ARGUMENT_TYPE_MISMATCH!>false<!>,
1.0,
false)<!> fun foo1() {}
false) fun foo1() {}
<!INAPPLICABLE_CANDIDATE!>@A(2.0, x = true, b = 2.0)<!> fun foo2() {}
@A(<!ARGUMENT_TYPE_MISMATCH!>2.0<!>, x = true, b = 2.0) fun foo2() {}