Keep single-statement blocks that carry comments when converting if/else-if to switch - #1256
Merged
jkschneider merged 1 commit intoOct 3, 2026
Conversation
jkschneider
force-pushed
the
java25/if-else-if-switch-comments
branch
from
October 3, 2026 15:51
5077d86 to
611466b
Compare
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
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.
IfElseIfConstructToSwitchunwraps a{ single statement }block into a switch arm expression and dropped any comment on the statement or on the block's braces. A block with a comment on the statement, before its closing brace, or on the block itself now stays a block.Found by a team of coding agents reviewing a Moderne run of
org.openrewrite.java.migrate.UpgradeToJava25over eight open-source repositories (run 20261003103223-WtyA8). The issue isswitch-loses-branch-commentin the run'sio.moderne.RecipeIssuesdata table, and the fix was discussed and reviewed on the run's message board. A row from the table, as a generalized example:Moving a cast declaration into an instanceof pattern drops the comment attached to the declaration. (
zendesk/maxwell,src/main/java/com/zendesk/maxwell/row/MaxwellJson.java)Before:
What the recipe produced:
Expected:
Stacked on #1255 (7 of 9); merge that one first.