FIR: Update test data (repeated diagnostics)
They are a bit redundant, but it needs additional work to be done to avoid them
This commit is contained in:
committed by
teamcityserver
parent
dbc0ebd861
commit
00821bbc63
@@ -15,5 +15,5 @@ public class P {
|
||||
|
||||
fun foo(c: P): MutableList<Int> {
|
||||
// Error should be here: see KT-8168 Typechecker fails for platform collection type
|
||||
return <!RETURN_TYPE_MISMATCH!>c.getList() ?: listOf()<!>
|
||||
return <!RETURN_TYPE_MISMATCH!>c.getList() ?: <!TYPE_MISMATCH!>listOf()<!><!>
|
||||
}
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ public fun <K, V> Map<K, V>.get1(key: Any?): Int = null!!
|
||||
public fun <@kotlin.internal.OnlyInputTypes K, V> Map<out K, V>.get1(key: K): V? = null!!
|
||||
|
||||
fun test(map: Map<Int, String>) {
|
||||
val a: Int = <!INITIALIZER_TYPE_MISMATCH!>listOf(1).contains1("")<!>
|
||||
val a: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>listOf(1).contains1("")<!>
|
||||
val b: Boolean = listOf(1).contains1(1)
|
||||
|
||||
val c: String? = map.get1("")
|
||||
|
||||
+2
-2
@@ -19,7 +19,7 @@ fun main() {
|
||||
val x1: suspend (Int) -> Unit = takeSuspend(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id { it }<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>{ x -> x }<!>)
|
||||
|
||||
// Here, the error should be
|
||||
val x2: (Int) -> Unit = takeSuspend(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id { it }<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>{ x -> x }<!>)
|
||||
val x3: suspend (Int) -> Unit = takeSimpleFunction(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id { it }<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>{ x -> x }<!>)
|
||||
val x2: (Int) -> Unit = takeSuspend(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id <!TYPE_MISMATCH, TYPE_MISMATCH!>{ it }<!><!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>"), TYPE_MISMATCH, TYPE_MISMATCH!>{ x -> x }<!>)
|
||||
val x3: suspend (Int) -> Unit = takeSimpleFunction(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>")!>id <!TYPE_MISMATCH, TYPE_MISMATCH!>{ it }<!><!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.coroutines.SuspendFunction1<kotlin.Int, kotlin.Unit>"), TYPE_MISMATCH, TYPE_MISMATCH!>{ x -> x }<!>)
|
||||
val x4: (Int) -> Unit = takeSimpleFunction(<!ARGUMENT_TYPE_MISMATCH!>id<suspend (Int) -> Unit> {}<!>, <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Function1<kotlin.Int, kotlin.Unit>")!>{}<!>)
|
||||
}
|
||||
|
||||
@@ -3,10 +3,10 @@ abstract class KFunctionKt9005WorkAround<out R: Any?>(private val _functionInsta
|
||||
private val _reflectedFunction: kotlin.reflect.KFunction<R> = _functionInstance.<!UNRESOLVED_REFERENCE!>reflect<!>() ?: throw IllegalStateException("")
|
||||
|
||||
private val _parameters: List<kotlin.reflect.KParameter> = run {
|
||||
_functionInstance.javaClass.methods.first().<!UNRESOLVED_REFERENCE!>parameters<!>.map {
|
||||
<!ARGUMENT_TYPE_MISMATCH!>_functionInstance.javaClass.methods.first().<!UNRESOLVED_REFERENCE!>parameters<!>.map {
|
||||
<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>object<!> : kotlin.reflect.KParameter {
|
||||
override val index: Int = 0
|
||||
}
|
||||
}
|
||||
}<!>
|
||||
}
|
||||
}
|
||||
|
||||
+6
-6
@@ -26,8 +26,8 @@ fun hashMapTest() {
|
||||
val b4: Map<String?, Int?> = x
|
||||
val b5: Map<String, Int?> = x
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
@@ -50,8 +50,8 @@ fun treeMapTest() {
|
||||
val b4: Map<String?, Int?> = x
|
||||
val b5: Map<String, Int?> = x
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
@@ -74,8 +74,8 @@ fun concurrentHashMapTest() {
|
||||
val b4: Map<String?, Int?> = x
|
||||
val b5: Map<String, Int?> = x
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
|
||||
compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
Vendored
+5
-5
@@ -25,9 +25,9 @@ fun hashMapTest() {
|
||||
val b4: Map<String?, Int?> = x
|
||||
val b5: Map<String, Int?> = <!INITIALIZER_TYPE_MISMATCH!>x<!>
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x[null]<!>
|
||||
val b8: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[null]<!>
|
||||
val b8: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b9: Int? = x.get("")
|
||||
}
|
||||
@@ -50,8 +50,8 @@ fun treeMapTest() {
|
||||
val b4: Map<String?, Int?> = x
|
||||
val b5: Map<String, Int?> = <!INITIALIZER_TYPE_MISMATCH!>x<!>
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
|
||||
+4
-4
@@ -25,8 +25,8 @@ fun hashMapTest() {
|
||||
val b4: Map<String, Int?> = x
|
||||
val b5: Map<String?, Int?> = x
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
@@ -49,8 +49,8 @@ fun treeMapTest() {
|
||||
val b4: Map<String, Int?> = x
|
||||
val b5: Map<String?, Int?> = x
|
||||
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH!>x.get("")<!>
|
||||
val b6: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x[""]<!>
|
||||
val b7: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x.get("")<!>
|
||||
|
||||
val b8: Int? = x.get("")
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ fun getComp(): Comparator<Foo?> =
|
||||
}<!>
|
||||
|
||||
fun getCompInverted(): Comparator<Foo?> =
|
||||
nullsLast(
|
||||
<!TYPE_MISMATCH!>nullsLast(
|
||||
when {
|
||||
else -> compareBy({ it.<!UNRESOLVED_REFERENCE!>a<!> }, { it.<!UNRESOLVED_REFERENCE!>b<!> })
|
||||
}
|
||||
)
|
||||
)<!>
|
||||
|
||||
Reference in New Issue
Block a user