Skip to content

Fix #3647: Define topLevelClass for NoDenotation #3717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 2, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions compiler/src/dotty/tools/dotc/core/SymDenotations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -925,11 +925,14 @@ object SymDenotations {
/** The top-level class containing this denotation,
* except for a toplevel module, where its module class is returned.
*/
final def topLevelClass(implicit ctx: Context): Symbol = {
def topLevel(d: SymDenotation): Symbol = {
if (d.isEffectiveRoot || (d is PackageClass) || (d.owner is PackageClass)) d.symbol
else topLevel(d.owner)
}
def topLevelClass(implicit ctx: Context): Symbol = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not do if (!exists) symbol instead of adding an override? That's more consistent with other definitions in this class like lexicallyEnclosingClass

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, I'll change it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final?


def topLevel(d: SymDenotation): Symbol =
if (!exists || d.isEffectiveRoot || (d is PackageClass) || (d.owner is PackageClass))
d.symbol
else
topLevel(d.owner)

val sym = topLevel(this)
if (sym.isClass) sym else sym.moduleClass
}
Expand Down
21 changes: 21 additions & 0 deletions tests/pos/i3647.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
object App {
def main(args: Array[String]): Unit = {
trait FooT {
type T
type Bar[A]

def get(k: Bar[T]): String
}
val test: FooT = new FooT {
type T = String
type Bar[A] = J[A]
sealed abstract class J[A]
final case object JName extends J[T]
final case object JInt extends J[Int]

def get(k: J[T]): String = k match {
case JName => "Age"
}
}
}
}