[Decompiler] Fix short name imports shadowed by super inner classes (IDEA-196315) #854
Conversation
This file contains 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
JDLogic
force-pushed
the
short-names
branch
from
bbc963a
to
40a85ca
Compare
|
|
JDLogic
force-pushed
the
short-names
branch
from
40a85ca
to
6f51221
Compare
|
Cleaned up this PR. Should be much better. |
gorrus
requested changes
Sep 21, 2018
| @@ -158,4 +161,24 @@ public int writeImports(TextBuffer buffer) { | |||
| .map(ent -> ent.getValue() + "." + ent.getKey()) | |||
| .collect(Collectors.toList()); | |||
| } | |||
|
|
|||
| private boolean isSuperInnerClass(StructClass cl, String className) { | |||
There was a problem hiding this comment.
I'm a little bit worried about performance here, wouldn't it be better to populate all classes names set in the ImportCollector constructor like we have already for fields (see org.jetbrains.java.decompiler.main.collectors.ImportCollector#setFieldNames)?
There was a problem hiding this comment.
I just got a chance to look this over, and you are correct. I'll update this PR soon.
JDLogic
force-pushed
the
short-names
branch
from
6f51221
to
2c5ec78
Compare
JDLogic
force-pushed
the
short-names
branch
from
2c5ec78
to
44748fe
Compare
|
Updated with the requested changes made. |
|
merged into master, thanks for contribution! |
SergeyZh
pushed a commit
that referenced
this pull request
Oct 9, 2020
) * Consider navigation element in PSI equality checks This seems to solve issues related to psi becoming outdated. Extension of comment by ajchun: mplushnikov/lombok-intellij-plugin#840 (comment) Covers issues: #821, #827, #829, #840, #842, #844, #846, #850, #853, #854, #855, #857 * Remove debug logging related to equality of PsiElements GitOrigin-RevId: e9ad9801b15dc91b872b14add012a9261033fbc7
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.
Currently, decompiling the modified test class will result in the short names
BuilderandEntryincorrectly being used as both these imports will be shadowed. This PR adds a check to the import collector to see if a short name will be shadowed a super inner class and adjusts the import accordingly.