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/targetedBuiltIns/concurrentMapRemove.fir.kt
Vendored
+2 -2
View File
@@ -8,9 +8,9 @@ val concurrentHash: ConcurrentHashMap<String, Int> = null!!
fun foo() {
concurrent.remove("", 1)
concurrent.<!INAPPLICABLE_CANDIDATE!>remove<!>("", "")
concurrent.remove("", <!ARGUMENT_TYPE_MISMATCH!>""<!>)
concurrentHash.remove("", 1)
concurrentHash.<!INAPPLICABLE_CANDIDATE!>remove<!>("", "")
concurrentHash.remove("", <!ARGUMENT_TYPE_MISMATCH!>""<!>)
// Flexible types
concurrent.remove(null, 1)
compiler/testData/diagnostics/tests/targetedBuiltIns/forEachRemainingNullability.fir.kt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ abstract class MyIt7 : Iterator<String> {
fun foo(x: Iterator<String>, y: Iterator<String?>) {
x.<!INAPPLICABLE_CANDIDATE!>forEachRemaining<!>(null)
x.forEachRemaining(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
x.forEachRemaining { it -> it.length }
x.forEachRemaining { it -> it?.length }
compiler/testData/diagnostics/tests/targetedBuiltIns/getOrDefault.fir.kt
Vendored
+9 -9
View File
@@ -4,17 +4,17 @@ abstract class A : Map<Int, String>
fun foo(x: Map<Int, String>, a: A, b: java.util.HashMap<Int, String>) {
x.getOrDefault(1, "")
x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
x.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
x.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, "")
x.getOrDefault(1, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
x.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
a.getOrDefault(1, "")
a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
a.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
a.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, "")
a.getOrDefault(1, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
a.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
b.getOrDefault(1, "")
b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", "")
b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>(1, 2)
b.<!INAPPLICABLE_CANDIDATE!>getOrDefault<!>("", 2)
b.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, "")
b.getOrDefault(1, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
b.getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>""<!>, <!ARGUMENT_TYPE_MISMATCH!>2<!>)
}
compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.fir.kt
Vendored
+4 -4
View File
@@ -18,14 +18,14 @@ class KotlinMap2 : java.util.AbstractMap<String, Int>() {
fun foo(x: MutableMap<String, Int>, y: java.util.HashMap<String, Int>, z: java.util.AbstractMap<String, Int>) {
x.remove("", 1)
x.<!INAPPLICABLE_CANDIDATE!>remove<!>("", "")
x.<!INAPPLICABLE_CANDIDATE!>remove<!>("", null)
x.remove("", <!ARGUMENT_TYPE_MISMATCH!>""<!>)
x.remove("", <!ARGUMENT_TYPE_MISMATCH!>null<!>)
y.remove("", 1)
y.<!INAPPLICABLE_CANDIDATE!>remove<!>("", "")
y.remove("", <!ARGUMENT_TYPE_MISMATCH!>""<!>)
y.remove("", null)
z.remove("", 1)
z.<!INAPPLICABLE_CANDIDATE!>remove<!>("", "")
z.remove("", <!ARGUMENT_TYPE_MISMATCH!>""<!>)
z.remove("", null)
}