Skip to content

Preserve comments before unwrapped else blocks #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinfrancois wants to merge 1 commit into
base: main
Choose a base branch
from
+67 −2
Open

Preserve comments before unwrapped else blocks #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/main/java/org/openrewrite/staticanalysis/UnwrapElseAfterReturn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,17 @@ private List<Statement> flatten(J.If tailIf, Statement tailElse, AtomicReference
J.Block elseBlock = (J.Block) tailElse;
endWhitespace.set(elseBlock.getEnd());
return ListUtils.concat(ifWithoutElse, ListUtils.mapFirst(elseBlock.getStatements(), elseStmt -> {
List<Comment> elsePartComments = tailIf.getElsePart().getPrefix().getComments();
List<Comment> elseComments = elseBlock.getPrefix().getComments();
List<Comment> stmtComments = elseStmt.getPrefix().getComments();
if (!elseComments.isEmpty() || !stmtComments.isEmpty()) {
return elseStmt.withComments(ListUtils.concatAll(elseComments, stmtComments));
if (!elsePartComments.isEmpty() || !elseComments.isEmpty() || !stmtComments.isEmpty()) {
return elseStmt.withPrefix(elseStmt.getPrefix()
.withWhitespace(elsePartComments.isEmpty() ?
elseStmt.getPrefix().getWhitespace() :
tailIf.getElsePart().getPrefix().getWhitespace())
.withComments(ListUtils.concatAll(
elsePartComments,
ListUtils.concatAll(elseComments, stmtComments))));
}
String whitespace = tailIf.getElsePart().getPrefix().getWhitespace();
return elseStmt.withPrefix(elseStmt.getPrefix().withWhitespace(whitespace));
Expand Down
58 changes: 58 additions & 0 deletions src/test/java/org/openrewrite/staticanalysis/UnwrapElseAfterReturnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,64 @@ int foo(boolean condition) {
);
}

@Test
void preserveCommentBeforeElseKeyword() {
rewriteRun(
//language=java
java(
"""
class MultilineElseTest {
int foo(boolean condition) {
if (condition) {
return 1;
}
// Handle false condition
else {
return 2;
}
}
}
""",
"""
class MultilineElseTest {
int foo(boolean condition) {
if (condition) {
return 1;
}
// Handle false condition
return 2;
}
}
"""
),
//language=java
java(
"""
class InlineElseTest {
int foo(boolean condition) {
if (condition) {
return 1;
}
// Handle false condition
else { return 2; }
}
}
""",
"""
class InlineElseTest {
int foo(boolean condition) {
if (condition) {
return 1;
}
// Handle false condition
return 2;
}
}
"""
)
);
}

@Test
void complexElseBlock() {
rewriteRun(
Expand Down
Loading