Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,10 @@ private String getPattern(J.InstanceOf statement) {
private Statement getStatement(Statement statement) {
if (statement instanceof J.Block && ((J.Block) statement).getStatements().size() == 1) {
Statement firstStatement = ((J.Block) statement).getStatements().get(0);
if (firstStatement instanceof Expression || firstStatement instanceof J.Throw) {
if ((firstStatement instanceof Expression || firstStatement instanceof J.Throw) &&
firstStatement.getComments().isEmpty() &&
statement.getComments().isEmpty() &&
((J.Block) statement).getEnd().getComments().isEmpty()) {
return firstStatement;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,42 @@ public void defaults(RecipeSpec spec) {
.allSources(source -> version(source, 21));
}

@Test
void preserveSingleStatementBranchComment() {
rewriteRun(
java(
"""
class Test {
void use(Object value) {}
void test(Object value) {
if (value instanceof String s) {
use(s);
} else if (value instanceof Integer i) { // integers need special handling
use(i);
} else {
use(value);
}
}
}
""",
"""
class Test {
void use(Object value) {}
void test(Object value) {
switch (value) {
case String s -> use(s);
case Integer i -> { // integers need special handling
use(i);
}
case null, default -> use(value);
}
}
}
"""
)
);
}

@DocumentExample
@Test
void defaultSwitchBlockWithNullCheckAndFinalElseStatement() {
Expand Down
Loading