Fix #2395: Check if the scala or dotty libraries are missing #3045
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
nicolasstucki
force-pushed
the
fix-#2395
branch
2 times, most recently
from
9d48aad to
cdd18ec
Compare
allanrenucci
reviewed
Sep 4, 2017
| val paths = Jars.dottyTestDeps map { p => | ||
| val classPath = mkClassPath(Jars.dottyTestDeps) | ||
|
|
||
| def mkClassPath(deps: List[String]) = { |
allanrenucci
reviewed
Sep 4, 2017
| @@ -1199,7 +1199,10 @@ object Denotations { | |||
| val alt = | |||
| if (generateStubs) missingHook(owner.symbol.moduleClass, selector) | |||
| else NoSymbol | |||
| if (alt.exists) alt.denot else MissingRef(owner, selector) | |||
| if (alt.exists) alt.denot | |||
| else if (owner.symbol == defn.RootClass && (selector == nme.scala_ || selector == nme.scalaShadowing)) | |||
There was a problem hiding this comment.
Maybe document what this test or extract it to an inner function.
I don't have a good understanding of this does though. @smarter?
nicolasstucki
force-pushed
the
fix-#2395
branch
from
c914b04 to
dc7cd4a
Compare
nicolasstucki
commented
Sep 4, 2017
| if (alt.exists) alt.denot else MissingRef(owner, selector) | ||
| if (alt.exists) alt.denot | ||
| else if (isPackageFromCoreLibMissing) throw new MissingCoreLibraryException(selector.toString) | ||
| else MissingRef(owner, selector) |
There was a problem hiding this comment.
@smarter could you review the isPackageFromCoreLibMissing condition in this file. Thanks.
smarter
reviewed
Sep 4, 2017
| @@ -1192,14 +1192,23 @@ object Denotations { | |||
| def staticRef(path: Name, generateStubs: Boolean = true, isPackage: Boolean = false)(implicit ctx: Context): Denotation = { | |||
| def select(prefix: Denotation, selector: Name): Denotation = { | |||
| val owner = prefix.disambiguate(_.info.isParameterless) | |||
| def isPackageFromCoreLibMissing: Boolean = { | |||
| owner.symbol == defn.RootClass && | |||
| { | |||
nicolasstucki
force-pushed
the
fix-#2395
branch
from
1f9a682 to
0258859
Compare
|
Rebased after drone update |
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.