Dmitriy Novozhilov
9807c67ae4
If some java class has multiple supertypes then we need to collect overriddens from all those types directly, even if superTypeScope (which is FirTypeIntersectionScope in this case) returns only one symbol from one of this types (not intersection one) This is needed to proper enhancement in cases when some type occurs multiple times in supertypes graph with different nullability of arguments: class ConcurrentHashMap<K, V> : AbstractMap<K!, V!>, MutableMap<K, V> If we try to find method `get(key: K): V` supertype scope returns `AbstractMap.get(key: K!): V!` (because it actually overrides `MutableMap(key: K): V?`), but we need to get both symbols to properly enhance types for `ConcurrentHashMap.remove`
66 lines
1.8 KiB
Kotlin
Vendored
66 lines
1.8 KiB
Kotlin
Vendored
// !CHECK_TYPE
|
|
// !LANGUAGE: -AdditionalBuiltInsMembers
|
|
// SKIP_TXT
|
|
// FULL_JDK
|
|
|
|
class A : java.util.ArrayList<String>() {
|
|
// `stream` is defined in ArrayList, so it was impossible to override it in 1.0
|
|
override fun stream(): java.util.stream.Stream<String> = super.stream()
|
|
|
|
// `sort` is defined in ArrayList, so it was possible to override it in 1.0
|
|
override fun sort(c: Comparator<in String>?) {
|
|
super.sort(c)
|
|
}
|
|
}
|
|
|
|
class A1 : java.util.ArrayList<String>() {
|
|
// `stream` is defined in Collection, so it was possible to declare it in 1.0 without an 'override' keyword
|
|
fun stream(): java.util.stream.Stream<String> = super.stream()
|
|
|
|
// `sort` is defined in ArrayList, so it was impossible to declare it in 1.0 without an 'override' keyword
|
|
fun <!VIRTUAL_MEMBER_HIDDEN!>sort<!>(c: Comparator<in String>?) {
|
|
super.sort(c)
|
|
}
|
|
}
|
|
|
|
interface A2 : List<String> {
|
|
override fun stream(): java.util.stream.Stream<String> = null!!
|
|
}
|
|
|
|
class B : Throwable("", null, false, false)
|
|
|
|
class B1 : RuntimeException() {
|
|
override fun fillInStackTrace(): Throwable { // 'override' keyword must be prohibited, as it was in 1.0.x
|
|
return this
|
|
}
|
|
}
|
|
|
|
class A3(val x: List<String>) : List<String> by x
|
|
|
|
fun Throwable.fillInStackTrace() = 1
|
|
|
|
fun foo(x: List<String>, y: Throwable, z: A3) {
|
|
x.stream()
|
|
java.util.ArrayList<String>().stream()
|
|
|
|
y.fillInStackTrace() checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Int>() }
|
|
|
|
HashMap<String, Int>().getOrDefault(<!ARGUMENT_TYPE_MISMATCH!>Any()<!>, <!NULL_FOR_NONNULL_TYPE!>null<!>)
|
|
|
|
// Falls back to extension in stdlib
|
|
y.printStackTrace()
|
|
|
|
z.stream()
|
|
}
|
|
|
|
interface X {
|
|
fun foo(): Int = 1
|
|
val hidden: Boolean
|
|
}
|
|
|
|
class Y : X {
|
|
// There should not be UNSUPPORTED_FEATURE diagnostic
|
|
override fun foo() = 1
|
|
override var hidden: Boolean = true
|
|
}
|