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

[FIR] Support several super-related diagnostics

Browse Source
This commit is contained in:
Nick
2020-03-27 03:18:03 +03:00
committed by Mikhail Glukhikh
parent 5570a5fe74
commit b38d30bab0
23 changed files with 456 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/thisAndSuper/Super.fir.kt
Vendored
+6 -6
View File
@@ -19,10 +19,10 @@ class A<E>() : C(), T {
super<C>@A.bar()
super<E>.<!UNRESOLVED_REFERENCE!>bar<!>()
super<E>@A.<!UNRESOLVED_REFERENCE!>bar<!>()
super<Int>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NOT_A_SUPERTYPE!>super<Int><!>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<<!SYNTAX!><!>>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<() -> Unit>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<Unit>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NOT_A_SUPERTYPE!>super<() -> Unit><!>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NOT_A_SUPERTYPE!>super<Unit><!>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<T>@B.foo()
super<C>@B.bar()
}
@@ -30,11 +30,11 @@ class A<E>() : C(), T {
inner class B : T {
fun test() {
super<T>.foo();
super<C>.bar()
super<C>@A.bar()
<!NOT_A_SUPERTYPE!>super<C><!>.bar()
<!NOT_A_SUPERTYPE!>super<C>@A<!>.bar()
super<T>@A.foo()
super<T>@B.foo()
super<C>@B.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NOT_A_SUPERTYPE!>super<C>@B<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
super.foo()
super
super<T>
compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.fir.kt
Vendored
+1 -1
View File
@@ -5,6 +5,6 @@ open class A {
interface ATrait : A {
override fun foo() {
super<A>.foo()
<!SUPERCLASS_NOT_ACCESSIBLE_FROM_INTERFACE!>super<A><!>.foo()
}
}
compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.fir.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
fun String.f() {
<!NO_SUPERTYPE, NO_SUPERTYPE!>super@f<!>.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!>.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super@f<!>.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!>.<!UNRESOLVED_REFERENCE!>compareTo<!>("")
}
compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.fir.kt
Vendored
+3 -3
View File
@@ -1,5 +1,5 @@
fun foo() {
<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!>
<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<Nothing>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!>
<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!>.<!UNRESOLVED_REFERENCE!>foo<!>()
<!SUPER_NOT_AVAILABLE!>super<Nothing><!>.<!UNRESOLVED_REFERENCE!>foo<!>()
}
compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.fir.kt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
fun any(a : Any) {}
fun notAnExpression() {
any(<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!>) // not an expression
if (<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!>) {} else {} // not an expression
val x = <!NO_SUPERTYPE, NO_SUPERTYPE, NO_SUPERTYPE!>super<!> // not an expression
any(<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!>) // not an expression
if (<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!>) {} else {} // not an expression
val x = <!NO_SUPERTYPE, NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!> // not an expression
when (1) {
<!NO_SUPERTYPE, NO_SUPERTYPE!>super<!> -> 1 // not an expression
<!NO_SUPERTYPE, NO_SUPERTYPE, SUPER_NOT_AVAILABLE!>super<!> -> 1 // not an expression
else -> {}
}
compiler/testData/diagnostics/tests/typealias/typeAliasAsSuperQualifier.fir.kt
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@ class TestSuperForBase : B() {
typealias MyBase = B
override fun foo() {
super<Base>.foo()
<!NOT_A_SUPERTYPE!>super<Base><!>.foo()
super<B>.foo()
super<MyBase>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<U>.foo()
@@ -32,7 +32,7 @@ class TestSuperForGenericBase<T> : GB<T>() {
typealias MyBaseInt = GB<Int>
override fun foo() {
super<GenericBase>.foo()
<!NOT_A_SUPERTYPE!>super<GenericBase><!>.foo()
super<GB>.foo()
super<MyBase>.<!UNRESOLVED_REFERENCE!>foo<!>()
super<MyBaseInt>.<!UNRESOLVED_REFERENCE!>foo<!>() // Type arguments don't matter here