fix: properly print type parameter reference in instanceof #4921
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
|
|
SirYwell
changed the title
MartinWitt
reviewed
Sep 27, 2022
| @@ -537,7 +537,7 @@ public <T> void visitCtBinaryOperator(CtBinaryOperator<T> operator) { | |||
| printer.writeSpace(); | |||
| try (Writable _context = context.modify()) { | |||
| if (operator.getKind() == BinaryOperatorKind.INSTANCEOF) { | |||
| _context.forceWildcardGenerics(true); | |||
| _context.forceWildcardGenerics(env.getComplianceLevel() < 16); | |||
There was a problem hiding this comment.
Can you please move this in a method containing an explanation why we have this condition?
MartinWitt
reviewed
Sep 27, 2022
| } | ||
|
|
||
| <T> T first(Iterable<T> iterable) { | ||
| if (iterable instanceof List<T> list) { |
There was a problem hiding this comment.
Could you add a test with List<T<U>> or something more complex?
MartinWitt
requested changes
Sep 27, 2022
MartinWitt
approved these changes
Sep 27, 2022
|
LGTM will merge tomorrow. |
MartinWitt
changed the title
|
Thanks @SirYwell. Almost forget merging this PR. Please don't hesitate to ping me next time. |
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.
Since Java 16, it is allowed to have type parameters other than
<?>in instanceof checks. This is allowed in cases where the generic type can be carried over from the type on the left side.I added a test with three such examples, one with pattern matching (the main reason this feature was added), one normal instanceof check with a type parameter as type argument and one with String as type argument.
The current solution is to not enforce wildcard in the printer for compliance mode >= 16. I would personally prefer to not change the printing output there at all, but there are tests relying on it - namely this one:
spoon/src/test/java/spoon/test/template/TemplateTest.java
Line 1096 in 59990fe
And it also might break existing code.
I'm not sure if that's the best solution. If you have any better ideas, please let me know.