Fix #3364: Name clash in class and its companion object #3368
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
allanrenucci
changed the title
allanrenucci
force-pushed
the
fix-#3364
branch
from
6e6916a to
6ef7a9f
Compare
smarter
reviewed
Oct 24, 2017
| if (!cls.owner.is(ModuleClass)) { | ||
| def clashes(sym: Symbol) = | ||
| sym.name.stripModuleClassSuffix == cls.name.stripModuleClassSuffix && | ||
| (sym.isClass || sym.is(ModuleClass)) |
allanrenucci
force-pushed
the
fix-#3364
branch
from
6ef7a9f to
5fd6fcf
Compare
smarter
approved these changes
Oct 24, 2017
| if (!cls.owner.is(ModuleClass)) { | ||
| def clashes(sym: Symbol) = | ||
| sym.name.stripModuleClassSuffix == cls.name.stripModuleClassSuffix && | ||
| sym.isClass |
There was a problem hiding this comment.
I would reverse the order of the conditions since sym.isClass is cheaper to compute
allanrenucci
force-pushed
the
fix-#3364
branch
from
5fd6fcf to
75f43ae
Compare
allanrenucci
force-pushed
the
fix-#3364
branch
from
75f43ae to
be9de00
Compare
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.
No description provided.