Avoid loading compilation units twice #3461
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
nicolasstucki
force-pushed
the
fix-case-class-from-tasty
branch
from
81202ad to
efbe537
Compare
nicolasstucki
force-pushed
the
fix-case-class-from-tasty
branch
2 times, most recently
from
37587f3 to
a05eda7
Compare
nicolasstucki
changed the title
nicolasstucki
force-pushed
the
fix-case-class-from-tasty
branch
from
a05eda7 to
957694c
Compare
smarter
reviewed
Nov 14, 2017
| } | ||
| compilationUnits | ||
| // Try to load it from the class, or else if the class is not present try to load it from the object with that name |
There was a problem hiding this comment.
I think this comment could be improved. I would say something like:
The TASTY section in a/b/C.class may either contain a class a.b.C, an object a.b.C, or both.
We first try to load the class and fallback to loading the object if the class doesn't exist.
Note that if both the class and the object are present, then loading the class will also load the object,
this is why we useorElsehere, otherwise we could load the object twice!
smarter
reviewed
Nov 14, 2017
| } | ||
| compilationUnits | ||
| // Try to load it from the class, or else if the class is not present try to load it from the object with that name | ||
| compilationUnit(className).orElse(compilationUnit(className.moduleClassName)).toList |
There was a problem hiding this comment.
Return type should be an Option and not a List now I guess.
There was a problem hiding this comment.
Done. It was only IntelliJ that complained about the Option in the flat map.
For some class name foo.Foo we need to try to load the tasty from the its class. If the class is not definded, we try load it from the obeject. Previously, if both the class and the object extists we were loading the compilation unit twice. Which would duplicate symbols and then fail with duplicated symbol definitions.
nicolasstucki
force-pushed
the
fix-case-class-from-tasty
branch
from
957694c to
723993e
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.