Fix #3736: Fix owner checking logic #3739
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
|
LGTM but I'd like @odersky to double-check this one. |
|
It's not possible to remove the test as in the original PR because otherwise e.g. would also count. The logic of |
smarter
approved these changes
Jan 3, 2018
smarter
previously requested changes
Jan 4, 2018
| @@ -292,16 +292,16 @@ trait TypeOps { this: Context => // TODO: Make standalone object. | |||
| if (!sym.exists || (sym eq defn.LanguageModuleClass)) "" | |||
| else toPrefix(sym.owner) + sym.name + "." | |||
| def featureName = toPrefix(owner) + feature | |||
| def hasImport(implicit ctx: Context): Boolean = { | |||
| if (ctx.importInfo == null || (ctx.importInfo.site.widen.typeSymbol ne owner)) false | |||
| else if (ctx.importInfo.excluded.contains(feature)) false | |||
There was a problem hiding this comment.
Previously, we stopped and returned false for an unimported feature, but we now continue looking up the chain for an import, this breaks the last three errors in the neg test https://github.com/lampepfl/dotty/blob/master/tests/neg/dynamicNoImport.scala
There was a problem hiding this comment.
Yes, indeed, the logic is quite subtle here (and it was not documented either).
nicolasstucki
force-pushed
the
fix-#3736
branch
from
756ba2b to
a4eb251
Compare
nicolasstucki
force-pushed
the
fix-#3736
branch
from
a4eb251 to
51498d2
Compare
nicolasstucki
changed the title
nicolasstucki
dismissed
smarter’s stale review
Reimplemented fix without removing the importInfo owner check
odersky
reviewed
Jan 4, 2018
smarter
approved these changes
Jan 4, 2018
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.