Improve sourcepath handling #7678
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
odersky
approved these changes
Dec 4, 2019
... and delete -scansource which is now unnecessary. The difference between these two settings is that the former assumes that a file A.scala contains a top-level class or object A, whereas the latter will use the outline parser to find definitions in A.scala and create symbols for them. So far we used the former to compile the standard library and dotty-library, and the latter for the IDE, but we might as well always use the latter, it's one less code path and dotty-library now uses top-level definitions (like `type IArray` in scala/IArray.scala) so the assumptions of -sourcepath do not apply to it anymore. (top-level definitions are still not handled correctly with -sourcepath after this commit, this is fixed in a latter commit in this PR) This change required moving WithBounds which was previously in the wrong directory.
The previous commit broke compilation of the standard library, because we ended up calling `runContext` before the first context is set, when it's still `null`. But we don't really need a new run just for creating the symbol: the completer we set will call Run#lateCompile which will take care of creating a new run anyway.
If a top-level definition is found in a file that is part of the sourcepath, create a symbol for the package object that will wrap the top-level definitions.
Move -sourcepath tests so that the directory passed to -sourcepath does not contain any unrelated files.
smarter
force-pushed
the
sourcepath-toplevel
branch
from
5007f97 to
1907b49
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.
Once we re-bootstrap with a compiler that contains this PR, I'll be able to make a follow-up PR to move IArray.scala from src-bootstrapped/ to src/