-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 = { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
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 | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 likelexicallyEnclosingClass
There was a problem hiding this comment.
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.