Map trailing commas as TrailingComma Marker, to fix J.Erroneous issues seen
#4869
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
Add an overload for `ReloadableJava17ParserVisitor#convert()` which allows supplying a `Markers` function, so that we can capture trailing commas using a `TrailingComma` marker and then also avoid the issue with the `J.Erroneous` getting constructed.
The last enum constant should only be right-padded if it has a trailing comma or semicolon. This is important because the whitespace after it belongs to the prefix of the next statement or the `J.Block#end`.
rewrite-test/src/main/java/org/openrewrite/test/TypeValidation.java
Outdated
Show resolved
Hide resolved
Laurens-W
reviewed
Jan 9, 2025
rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java
Show resolved
Hide resolved
Comment on lines
+481
to
+483
| if (t != lastConstant) { | ||
| return whitespace(); | ||
| } |
There was a problem hiding this comment.
This if-block is actually not necessary, as we are here inside the suffix function which is only ever applied to the last element.
There was a problem hiding this comment.
I agree but on the other hand it also guarantees that we don't accidentally do harm when it is called on an element that is not the last one
timtebeek
commented
Jan 9, 2025
timtebeek
changed the title
TrailingComma Marker, to fix J.Erroneous issues seen
This was referenced Jan 9, 2025
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.
Fixes Trailing comma in an array end up in white-space #3997
Fixes Parsing issue: Trailing comma on enums is parsed into whitespace #3879
Related to Gradle parser fails with a trailing comma in method call #4614