Allow completion from source #3686
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
force-pushed
the
add-sourcepath
branch
2 times, most recently
from
1498762 to
196c1a4
Compare
smarter
reviewed
Dec 21, 2017
| */ | ||
| def enterRoots(file: AbstractFile)(implicit ctx: Context): Unit = | ||
| if (!files.contains(file)) { | ||
| val unit = new CompilationUnit(getSource(file.path)) |
There was a problem hiding this comment.
Shouldn't we add the unit to units at this point ?
|
@smarter Do you suggest further changes? |
smarter
approved these changes
Jan 13, 2018
| def checkPathMatches(path: List[TermName], what: String, tree: MemberDef): Boolean = { | ||
| val ok = filePath == path | ||
| if (!ok) | ||
| ctx.warning(i"""$what ${tree.name} is in wrong directory. |
| @@ -750,7 +758,7 @@ class Namer { typer: Typer => | |||
| } | |||
|
|
|||
| /** The completer of a symbol defined by a member def or import (except ClassSymbols) */ | |||
| class Completer(val original: Tree)(implicit ctx: Context) extends LazyType { | |||
| class Completer(val original: Tree)(implicit ctx: Context) extends LazyType with SymbolLoaders.SecondCompleter { | |||
There was a problem hiding this comment.
Why is SecondCompleter needed here now?
smarter
reviewed
Jan 13, 2018
| /** Units that are added because of source completers but that are not | ||
| * compiled in current run. | ||
| */ | ||
| val lateUnits = mutable.ListBuffer[CompilationUnit]() |
There was a problem hiding this comment.
Would be nicer if the mutability was hidden from outside this class, like for units and files.
odersky
force-pushed
the
add-sourcepath
branch
3 times, most recently
from
51b248d to
9a26f67
Compare
With late source loading we need to access the current run from the current context anyway, so there's no need to separate Run and RunInfo.
This lets us find a class for completion even if its name is not the filename of the containing class.
Store them in `lateUnits` (and `lateFiles` for the associated files). An IDE can inquire about units and persist them to the next runs.
odersky
force-pushed
the
add-sourcepath
branch
from
9a26f67 to
4d992ae
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.
If -sourcepath is set, we now allow completion from sources that are in the canonical place (i.e. fully qualified source name ~ path name of source file relative to source path). If both class and source file exist, the newer one is chosen.
To do: it would be nice to optionally scan all sources so that classes can be found even if their
fully qualified name does not correspond to the file name. Logically, this should be done in
ClassPath.scala.