Extend UnnecessarilyFullyQualified to remove java.lang qualifiers
#2
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
rickie
force-pushed
the
rossendrijver/java_lang_qualified
branch
2 times, most recently
from
d0f336f
to
f3542a4
Compare
rickie
force-pushed
the
rossendrijver/java_lang_qualified
branch
from
f3542a4
to
cd5be4b
Compare
Stephan202
reviewed
Oct 10, 2021
| @@ -61,6 +61,7 @@ | |||
| public final class UnnecessarilyFullyQualified extends BugChecker | |||
| implements CompilationUnitTreeMatcher { | |||
|
|
|||
| private static final String JAVA_LANG = "java.lang"; | |||
There was a problem hiding this comment.
While no such package currently exist, we shouldn't also match a hypothetical java.langSomeSuffix:
Suggested change
| private static final String JAVA_LANG = "java.lang"; | |
| private static final String JAVA_LANG = "java.lang."; |
Comment on lines
173
to
168
| if (!pathsToFix.get(0).getLeaf().toString().contains(JAVA_LANG) | ||
| && pathsToFix.stream() | ||
| .anyMatch(path -> findIdent(nameString, state.withPath(path), VAL_TYP) != null)) { | ||
| continue; | ||
| } |
There was a problem hiding this comment.
I don't think we should to special-case java.lang here. Instead we should generalize the anyMatch logic and compare any matching ident again the type symbol under consideration; if they're the same we can proceed.
Suggested change
| if (!pathsToFix.get(0).getLeaf().toString().contains(JAVA_LANG) | |
| && pathsToFix.stream() | |
| .anyMatch(path -> findIdent(nameString, state.withPath(path), VAL_TYP) != null)) { | |
| continue; | |
| } | |
| if (pathsToFix.stream() | |
| .anyMatch( | |
| path -> { | |
| Symbol ident = findIdent(nameString, state.withPath(path), VAL_TYP); | |
| return ident != null && !ident.equals(type); | |
| })) { | |
| continue; | |
| } |
| continue; | ||
| } | ||
| SuggestedFix.Builder fixBuilder = SuggestedFix.builder(); | ||
| fixBuilder.addImport(getOnlyElement(types.keySet()).getQualifiedName().toString()); | ||
| String newImport = getOnlyElement(types.keySet()).getQualifiedName().toString(); | ||
| if (!newImport.contains(JAVA_LANG)) { |
There was a problem hiding this comment.
Suggested change
| if (!newImport.contains(JAVA_LANG)) { | |
| if (!newImport.startsWith(JAVA_LANG)) { |
Stephan202
force-pushed
the
rossendrijver/java_lang_qualified
branch
from
cd5be4b
to
9a06dc8
Compare
Stephan202
reviewed
Oct 12, 2021
rickie
force-pushed
the
rossendrijver/java_lang_qualified
branch
from
43d7f86
to
b368b93
Compare
rickie
force-pushed
the
rossendrijver/java_lang_qualified
branch
from
b368b93
to
80dc087
Compare
Stephan202
approved these changes
Dec 23, 2021
There was a problem hiding this comment.
Slightly extended suggested commit message:
UnnecessarilyFullyQualified: handle `java.lang` and inconsistent import usages
This introduces two improvements:
- Where possible `java.lang.SomeType` references are simplified to `SomeType`
without introducing an associated `import` statement.
- References to `some.package.SomeType` are now also replaced with `SomeType`
if said type is already imported and referenced by its simple name elsewhere
in the compilation unit.
d70dd0f
to
8051af2
Compare
|
Opened PR upstream: google#2776 |
Stephan202
force-pushed
the
rossendrijver/java_lang_qualified
branch
from
8051af2
to
1dae0db
Compare
|
Closing this PR as it got merged in: google@c07a7a9 |
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.