Fix #10868: Handle semantic name in Java source code #11472
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
liufengyun
force-pushed
the
fix-10868
branch
3 times, most recently
from
14f09b9 to
b37f184
Compare
liufengyun
force-pushed
the
fix-10868
branch
from
b37f184 to
14395cf
Compare
liufengyun
changed the title
smarter
requested changes
Feb 23, 2021
Comment on lines
601
to
605
| if !qual.symbol.is(JavaDefined) && tree.name.endsWith("$") | ||
| then | ||
| val nameOrig = tree.name.asSimpleName | ||
| val nameSemantic = nameOrig.slice(0, nameOrig.length - 1).moduleClassName | ||
| val tree2 = untpd.cpy.Select(tree)(qual, nameSemantic) |
There was a problem hiding this comment.
unmangleClassName in NameOps already has similar logic
There was a problem hiding this comment.
Thanks for the tip 👍
smarter
previously approved these changes
Feb 23, 2021
Comment on lines
601
to
602
| if !qual.symbol.is(JavaDefined) | ||
| then |
There was a problem hiding this comment.
we usually put the then on the same line as the if
There was a problem hiding this comment.
Indeed, that looks better
liufengyun
force-pushed
the
fix-10868
branch
from
98dac6b to
37ab3b3
Compare
smarter
approved these changes
Feb 24, 2021
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.
Fix #10868: Handle semantic name in Java source code