Skip to content

Fix Simplify if/else to single return if possible clean-up #3038

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

Merged
jjohnstn merged 1 commit into from
Jun 17, 2026
Merged

Fix Simplify if/else to single return if possible clean-up #3038

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
2 changes: 2 additions & 0 deletions ...manipulation/common/org/eclipse/jdt/internal/ui/fix/SimplifyBooleanIfElseCleanUpCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ public static SimplifyStatus verifyBooleanIfElse(final IfStatement ifStatement)
if (thenStatement instanceof ReturnStatement returnStatement) {
if (returnStatement.getExpression() instanceof BooleanLiteral literal) {
thenValue= literal.booleanValue();
} else {
return SimplifyStatus.INVALID;
}
} else if (thenStatement instanceof Block block && block.statements().size() == 1
&& block.statements().get(0) instanceof ReturnStatement returnStatement) {
Expand Down
8 changes: 8 additions & 0 deletions org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16879,6 +16879,7 @@ public void testDoNotSimplifyBooleanIfElseExpression01() throws Exception {
package test1;

public class E {
String text;
public boolean doNotSimplifyIfBooleanSame(int x) {
if (x > 0 && x < 7) {
return true;
Expand Down Expand Up @@ -16911,6 +16912,13 @@ public int doNotSimplifyNoneBoolean(String x) {
return 2;
}
}

public boolean doNotSimplifyInfixExpression(Integer x) {
if (text != null)
return text.length() > 43;
else
return false;
}
}
""";

Expand Down
Loading