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

[FIR] Partial implementation of DEPRECATION(_ERROR) diagnostics

Browse Source 
No support for inheritance deprecations
and deprecations in qualifier's parts
This commit is contained in:
Andrey Zinovyev
2021-06-23 15:25:23 +03:00
committed by teamcityserver
parent 9fad55d551
commit de3f31cf78
188 changed files with 984 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.fir.kt
Vendored
-99
View File
@@ -1,99 +0,0 @@
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// See KT-21515 for a class diagram and details
// Object is to prevent accidental short-name import
object O {
open class Alpha {
class FromAlpha
companion object {
class FromCompanionAlpha
}
}
open class Beta : Alpha() {
class FromBeta
companion object {
class FromCompanionBeta
}
}
open class A {
class FromA
companion object : Beta() {
class FromCompanionA
}
}
//////////////////////////
open class FarAway {
class FromFarAway
}
open class Gamma {
class FromGamma
companion object : FarAway() {
class FromCompanionGamma
}
}
open class B : A() {
class FromB
companion object : Gamma() {
class FromCompanionB
}
}
}
///////////////////////////////
open class Delta {
class FromDelta
}
class C : O.B() {
companion object : Delta() {
class FromCompanionC
}
// VISIBLE: Classifiers from direct superclasses
val c: FromA? = null
val d: FromB? = null
// VISIBLE: Classifiers from our own companion
val n: FromCompanionC? = null
// INVISIBLE: direct superclasses themselves.
val a: <!UNRESOLVED_REFERENCE!>A?<!> = null
val b: <!UNRESOLVED_REFERENCE!>B?<!> = null
// DEPRECATED: Classifiers from companions of direct superclasses
val e: <!UNRESOLVED_REFERENCE!>FromCompanionA?<!> = null
val f: <!UNRESOLVED_REFERENCE!>FromCompanionB?<!> = null
// INVISIBLE: "cousin" supertypes themselves
val g: <!UNRESOLVED_REFERENCE!>Alpha?<!> = null
val h: <!UNRESOLVED_REFERENCE!>Beta?<!> = null
val i: <!UNRESOLVED_REFERENCE!>Gamma?<!> = null
// DEPRECATED: classifiers from "cousin" superclasses
val k: <!UNRESOLVED_REFERENCE!>FromAlpha?<!> = null
val l: <!UNRESOLVED_REFERENCE!>FromBeta?<!> = null
val m: <!UNRESOLVED_REFERENCE!>FromGamma?<!> = null
// INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
val o: <!UNRESOLVED_REFERENCE!>FromCompanionAlpha?<!> = null
val p: <!UNRESOLVED_REFERENCE!>FromCompanionBeta?<!> = null
val q: <!UNRESOLVED_REFERENCE!>FromCompanionGamma?<!> = null
// DEPRECATED: Classifiers from supertypes of our own companion
val r: <!UNRESOLVED_REFERENCE!>FromDelta?<!> = null
}
compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectNew.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// See KT-21515 for a class diagram and details
compiler/testData/diagnostics/tests/objects/kt21515/classifierFromCompanionObjectOld.fir.kt
Vendored
+14 -14
View File
@@ -71,28 +71,28 @@ class C : O.B() {
val n: FromCompanionC? = null
// INVISIBLE: direct superclasses themselves.
val a: <!UNRESOLVED_REFERENCE!>A?<!> = null
val b: <!UNRESOLVED_REFERENCE!>B?<!> = null
val a: <!UNRESOLVED_REFERENCE!>A<!>? = null
val b: <!UNRESOLVED_REFERENCE!>B<!>? = null
// DEPRECATED: Classifiers from companions of direct superclasses
val e: <!UNRESOLVED_REFERENCE!>FromCompanionA?<!> = null
val f: <!UNRESOLVED_REFERENCE!>FromCompanionB?<!> = null
val e: <!UNRESOLVED_REFERENCE!>FromCompanionA<!>? = null
val f: <!UNRESOLVED_REFERENCE!>FromCompanionB<!>? = null
// INVISIBLE: "cousin" supertypes themselves
val g: <!UNRESOLVED_REFERENCE!>Alpha?<!> = null
val h: <!UNRESOLVED_REFERENCE!>Beta?<!> = null
val i: <!UNRESOLVED_REFERENCE!>Gamma?<!> = null
val g: <!UNRESOLVED_REFERENCE!>Alpha<!>? = null
val h: <!UNRESOLVED_REFERENCE!>Beta<!>? = null
val i: <!UNRESOLVED_REFERENCE!>Gamma<!>? = null
// DEPRECATED: classifiers from "cousin" superclasses
val k: <!UNRESOLVED_REFERENCE!>FromAlpha?<!> = null
val l: <!UNRESOLVED_REFERENCE!>FromBeta?<!> = null
val m: <!UNRESOLVED_REFERENCE!>FromGamma?<!> = null
val k: <!UNRESOLVED_REFERENCE!>FromAlpha<!>? = null
val l: <!UNRESOLVED_REFERENCE!>FromBeta<!>? = null
val m: <!UNRESOLVED_REFERENCE!>FromGamma<!>? = null
// INVISIBLE: We don't see classifiers from companions of "cousin" superclasses
val o: <!UNRESOLVED_REFERENCE!>FromCompanionAlpha?<!> = null
val p: <!UNRESOLVED_REFERENCE!>FromCompanionBeta?<!> = null
val q: <!UNRESOLVED_REFERENCE!>FromCompanionGamma?<!> = null
val o: <!UNRESOLVED_REFERENCE!>FromCompanionAlpha<!>? = null
val p: <!UNRESOLVED_REFERENCE!>FromCompanionBeta<!>? = null
val q: <!UNRESOLVED_REFERENCE!>FromCompanionGamma<!>? = null
// DEPRECATED: Classifiers from supertypes of our own companion
val r: <!UNRESOLVED_REFERENCE!>FromDelta?<!> = null
val r: <!UNRESOLVED_REFERENCE!>FromDelta<!>? = null
}