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/inference/regressions/kt1145.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ import checkSubtype
fun test(numbers: Iterable<Int>) {
val s = numbers.map{it.toString()}.fold(""){it, it2 -> it + it2}
<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(s)
checkSubtype<Int>(<!ARGUMENT_TYPE_MISMATCH!>s<!>)
}
//from library
compiler/testData/diagnostics/tests/inference/regressions/kt1718.fir.kt
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@ fun test() {
val list = arrayList("foo", "bar") + arrayList("cheese", "wine")
checkSubtype<List<String>>(list)
//check it's not an error type
<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><Int>(list)
checkSubtype<Int>(<!ARGUMENT_TYPE_MISMATCH!>list<!>)
}
//from library
compiler/testData/diagnostics/tests/inference/regressions/kt2407.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ import checkSubtype
fun test() {
val foo = arrayList("").map { it -> it.length }.fold(0, { x, y -> Math.max(x, y) })
checkSubtype<Int>(foo)
<!INAPPLICABLE_CANDIDATE!>checkSubtype<!><String>(foo)
checkSubtype<String>(<!ARGUMENT_TYPE_MISMATCH!>foo<!>)
}
//from library
compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ fun <T> bar(a: T, b: Map<T, String>) = b.get(a)
fun test(a: Int) {
foo(a, null)
<!INAPPLICABLE_CANDIDATE!>bar<!>(a, null)
bar(a, <!ARGUMENT_TYPE_MISMATCH!>null<!>)
}
fun test1(a: Int) {
foo(a, throw Exception())
compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
Vendored
+7 -7
View File
@@ -5,21 +5,21 @@ import java.lang.Exception
fun <K> id(arg: K): K = arg
fun test() {
id(<!UNRESOLVED_REFERENCE!>unresolved<!>)<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)!!
<!UNRESOLVED_REFERENCE!>unresolved<!>!!!!
try {
id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
} catch (e: Exception) {
id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
}
if (true)
id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
else
id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
when {
true -> <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
true -> id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
}
id(<!UNRESOLVED_REFERENCE!>unresolved<!>) ?: id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>) ?: id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
}
compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
Vendored
+2 -2
View File
@@ -4,8 +4,8 @@ fun <K> id(arg: K): K = arg
fun <M> materialize(): M = TODO()
fun test(b: Boolean) {
<!INAPPLICABLE_CANDIDATE!>id<!>(if (b) {
<!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
id(if (b) {
id(<!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>unresolved<!>)
} else {
id(
materialize()
compiler/testData/diagnostics/tests/inference/regressions/kt41386.fir.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// !LANGUAGE: +NewInference
open class Test<T1, T2>(val map1 : Map<T1, T2>, val map2 : Map<T2, T1>) {
open val inverse: Test<T2, T1> = object : <!INAPPLICABLE_CANDIDATE!>Test<T2, T1><!>(map2, map1) {
open val inverse: Test<T2, T1> = object : Test<T2, T1>(<!ARGUMENT_TYPE_MISMATCH!>map2<!>, <!ARGUMENT_TYPE_MISMATCH!>map1<!>) {
override val inverse: Test<T1, T2>
get() = this@Test
}