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/tests/varargs/NullableTypeForVarargArgument.fir.kt
Vendored
+4 -4
View File
@@ -31,8 +31,8 @@ fun getArr(): Array<String>? = null
fun f() {
A().foo(1, *args)
<!INAPPLICABLE_CANDIDATE!>bar<!>(2, *args)
baz(<!NON_VARARG_SPREAD!>*<!>args)
bar(2, *<!ARGUMENT_TYPE_MISMATCH!>args<!>)
baz(<!NON_VARARG_SPREAD!>*<!><!ARGUMENT_TYPE_MISMATCH!>args<!>)
}
fun g(args: Array<String>?) {
@@ -55,8 +55,8 @@ fun h(b: B) {
fun k() {
A().foo(1, *getArr())
<!INAPPLICABLE_CANDIDATE!>bar<!>(2, *getArr())
baz(<!NON_VARARG_SPREAD!>*<!>getArr())
bar(2, *<!ARGUMENT_TYPE_MISMATCH!>getArr()<!>)
baz(<!NON_VARARG_SPREAD!>*<!><!ARGUMENT_TYPE_MISMATCH!>getArr()<!>)
}
fun invokeTest(goodArgs: Array<String>) {
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
Vendored
+2 -2
View File
@@ -10,13 +10,13 @@ fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(arr) // Error
withVararg(<!ARGUMENT_TYPE_MISMATCH!>arr<!>) // Error
withVararg(*arr) // OK
withVararg(s = arr) // Error
withVararg(s = *arr) // OK
withVararg(s) // OK
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(s = s) // Error
withVararg(s = <!ARGUMENT_TYPE_MISMATCH!>s<!>) // Error
}
fun test_ann(s: String, arr: Array<String>) {
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
Vendored
+2 -2
View File
@@ -10,13 +10,13 @@ fun withVararg(vararg s: String) {}
fun foo() {}
fun test_fun(s: String, arr: Array<String>) {
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(arr) // Error
withVararg(<!ARGUMENT_TYPE_MISMATCH!>arr<!>) // Error
withVararg(*arr) // OK
withVararg(s = arr) // OK
withVararg(s = *arr) // Warning
withVararg(s) // OK
<!INAPPLICABLE_CANDIDATE!>withVararg<!>(s = s) // Error
withVararg(s = <!ARGUMENT_TYPE_MISMATCH!>s<!>) // Error
}
fun test_ann(s: String, arr: Array<String>) {
compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt
Vendored
+2 -2
View File
@@ -15,10 +15,10 @@ annotation class Ann(vararg val s: String)
@Ann(s = arrayOf())
fun test1() {}
<!INAPPLICABLE_CANDIDATE!>@Ann(s = intArrayOf())<!>
@Ann(s = <!ARGUMENT_TYPE_MISMATCH!>intArrayOf()<!>)
fun test2() {}
<!INAPPLICABLE_CANDIDATE!>@Ann(s = arrayOf(1))<!>
@Ann(s = <!ARGUMENT_TYPE_MISMATCH!>arrayOf(1)<!>)
fun test3() {}
@Ann("value1", "value2")
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
Vendored
+4 -4
View File
@@ -53,8 +53,8 @@ fun testMany(a: Any) {
manyFoo(s = "")
<!NONE_APPLICABLE!>manyFoo<!>(a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a as Int)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a as String)
manyFoo(v = <!ARGUMENT_TYPE_MISMATCH!>a<!>)
manyFoo(s = <!ARGUMENT_TYPE_MISMATCH!>a<!>)
manyFoo(v = <!ARGUMENT_TYPE_MISMATCH!>a as Int<!>)
manyFoo(s = <!ARGUMENT_TYPE_MISMATCH!>a as String<!>)
}
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
Vendored
+4 -4
View File
@@ -53,8 +53,8 @@ fun testMany(a: Any) {
manyFoo(s = "")
<!NONE_APPLICABLE!>manyFoo<!>(a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(v = a as Int)
<!INAPPLICABLE_CANDIDATE!>manyFoo<!>(s = a as String)
manyFoo(v = <!ARGUMENT_TYPE_MISMATCH!>a<!>)
manyFoo(s = <!ARGUMENT_TYPE_MISMATCH!>a<!>)
manyFoo(v = <!ARGUMENT_TYPE_MISMATCH!>a as Int<!>)
manyFoo(s = <!ARGUMENT_TYPE_MISMATCH!>a as String<!>)
}
compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt
Vendored
+2 -2
View File
@@ -15,10 +15,10 @@ annotation class Ann(vararg val s: String)
@Ann(s = arrayOf())
fun test1() {}
<!INAPPLICABLE_CANDIDATE!>@Ann(s = intArrayOf())<!>
@Ann(s = <!ARGUMENT_TYPE_MISMATCH!>intArrayOf()<!>)
fun test2() {}
<!INAPPLICABLE_CANDIDATE!>@Ann(s = arrayOf(1))<!>
@Ann(s = <!ARGUMENT_TYPE_MISMATCH!>arrayOf(1)<!>)
fun test3() {}
@Ann(s = ["value"])
compiler/testData/diagnostics/tests/varargs/varargsAndPair.fir.kt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ class Pair<A>(a: A)
fun test() {
val v = foo(Pair(1))
<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(v) // check that it is not error type
checkSubtype<Int>(<!ARGUMENT_TYPE_MISMATCH!>v<!>) // check that it is not error type
}