Weaken assumption in mergeCompanionDefs #1933
Merged
Conversation
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
smarter
reviewed
Feb 2, 2017
| @@ -491,7 +491,8 @@ class Namer { typer: Typer => | |||
| if (cdef.isClassDef) { | |||
| classDef(name) = cdef | |||
| cdef.attachmentOrElse(ExpandedTree, cdef) match { | |||
| case Thicket(cls :: mval :: (mcls @ TypeDef(_, _: Template)) :: crest) => | |||
| case Thicket(cls :: mval :: (mcls @ TypeDef(mname, _: Template)) :: crest) | |||
| if name ++ nme.MODULE_SUFFIX == mname => | |||
There was a problem hiding this comment.
NameOps has a moduleClassName method to do that
There was a problem hiding this comment.
Thanks for the tip @smarter 👍
Previously `mergeCompanionDefs` assumes that if the attachment of class `Foo` is as follows:
x :: y :: tdef @ TypeDef(_, templ)
Then the `tdef` must be `Foo$`. When there are multiple pre-typer transforms,
this is not necessarily true. For example, an annotation macro expansion may
expand a non-case class `Foo` to `class Foo; object FooA`.
We need to check the name of `tdef` to be equal to `Foo$`.
liufengyun
force-pushed
the
merge-companion
branch
from
f3a0b01 to
e53ace1
Compare
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously
mergeCompanionDefsassumes that if the attachment of classFoois as follows:Then
tdefmust beFoo$. When there are multiple pre-typer transforms,this is not necessarily true. For example, an annotation macro expansion may
expand a non-case class
Footoclass Foo; object FooA.We need to check the name of
tdefto be equal toFoo$.Review @odersky .