Ilya Gorbunov
84a7e3c032
Refactor AbstractResolvedCallsTest to support multiple carets (multiple methods being tested for resolve) in testdata file.
43 lines
2.3 KiB
Plaintext
Vendored
43 lines
2.3 KiB
Plaintext
Vendored
fun valuesNotNull(map: MutableMap<Int, String>) {
|
|
map.merge(1, "x") { old, new -> old + new }
|
|
// SUCCESS
|
|
// ORIGINAL: fun merge(K, V, (V, V) -> V?): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, String, (String, String) -> String?): String? defined in kotlin.collections.MutableMap
|
|
}
|
|
|
|
fun valuesNullable(map: MutableMap<Int, String?>) {
|
|
map.merge(1, "x") { old, new -> old + new }
|
|
// SUCCESS
|
|
// ORIGINAL: fun merge(K, V, (V, V) -> V?): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, String, (String, String) -> String?): String? defined in kotlin.collections.MutableMap
|
|
map.merge(1, null) { old, new -> old + new }
|
|
// OTHER_ERROR
|
|
// ORIGINAL: fun merge(K, V, BiFunction<in V, in V, out V?>): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, String, BiFunction<in String, in String, out String?>): String? defined in kotlin.collections.MutableMap
|
|
}
|
|
|
|
fun <T> valuesT(map: MutableMap<Int, T>, newValue: T) {
|
|
map.merge(1, newValue) { old, new -> null }
|
|
// SUCCESS
|
|
// ORIGINAL: fun merge(K, V, (V, V) -> V?): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, T, (T, T) -> T?): T? defined in kotlin.collections.MutableMap
|
|
}
|
|
|
|
fun <T : Any> valuesTNotNull(map: MutableMap<Int, T>, newValue: T) {
|
|
map.merge(1, newValue) { old, new -> null }
|
|
// SUCCESS
|
|
// ORIGINAL: fun merge(K, V, (V, V) -> V?): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, T, (T, T) -> T?): T? defined in kotlin.collections.MutableMap
|
|
}
|
|
|
|
fun <T : Any> valuesTNullable(map: MutableMap<Int, T?>, newValue: T?) {
|
|
map.merge(1, newValue) { old, new -> new }
|
|
// OTHER_ERROR
|
|
// ORIGINAL: fun merge(K, V, BiFunction<in V, in V, out V?>): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, T, BiFunction<in T, in T, out T?>): T? defined in kotlin.collections.MutableMap
|
|
map.merge(1, newValue!!) { old, new -> new }
|
|
// SUCCESS
|
|
// ORIGINAL: fun merge(K, V, (V, V) -> V?): V? defined in kotlin.collections.MutableMap
|
|
// SUBSTITUTED: fun merge(Int, T, (T, T) -> T?): T? defined in kotlin.collections.MutableMap
|
|
}
|