azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR: Implement FE 1.0 semantics for super unqualified calls

Browse Source 
See original logic at org.jetbrains.kotlin.types.expressions.unqualifiedSuper.UnqualifiedSuperKt#resolveUnqualifiedSuperFromExpressionContext

^KT-39070 Fixed
^KT-39599 Related
This commit is contained in:
Denis Zharkov
2020-07-20 12:24:51 +03:00
parent dfc75f3447
commit cd896ae6c8
26 changed files with 285 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.fir.kt
Vendored
+6 -6
View File
@@ -14,7 +14,7 @@ class GenericDerivedClass<T> : GenericBaseClass<T>(), GenericBaseInterface<T> {
override fun bar(x: T): T = super.bar(x)
override fun ambiguous(x: T): T =
super.<!AMBIGUITY!>ambiguous<!>(x)
super.<!UNRESOLVED_REFERENCE!>ambiguous<!>(x)
}
class SpecializedDerivedClass : GenericBaseClass<Int>(), GenericBaseInterface<String> {
@@ -22,9 +22,9 @@ class SpecializedDerivedClass : GenericBaseClass<Int>(), GenericBaseInterface<St
override fun bar(x: String): String = super.bar(x)
override fun ambiguous(x: String): String =
super.ambiguous(x)
super.<!UNRESOLVED_REFERENCE!>ambiguous<!>(x)
override fun ambiguous(x: Int): Int =
super.ambiguous(x)
super.<!UNRESOLVED_REFERENCE!>ambiguous<!>(x)
}
class MixedDerivedClass<T> : GenericBaseClass<Int>(), GenericBaseInterface<T> {
@@ -32,7 +32,7 @@ class MixedDerivedClass<T> : GenericBaseClass<Int>(), GenericBaseInterface<T> {
override fun bar(x: T): T = super.bar(x)
override fun ambiguous(x: Int): Int =
super.ambiguous(x)
super.<!UNRESOLVED_REFERENCE!>ambiguous<!>(x)
override fun ambiguous(x: T): T =
super.ambiguous(x)
}
super.<!UNRESOLVED_REFERENCE!>ambiguous<!>(x)
}