Skip to content

Commit

Permalink
Simplify SimplifyBooleanExpressionVisitor
Browse files Browse the repository at this point in the history
  • Loading branch information
@knutwannheden
knutwannheden committed Oct 18, 2023
1 parent 0b56a1d commit a9e347e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 37 deletions.
2 changes: 1 addition & 1 deletion ...test/src/test/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ void autoFormatIsConditionallyApplied() {
public class A {
{
boolean a=true;
boolean i=(a!=true);
boolean i=a!=true;
}
}
"""
Expand Down
39 changes: 3 additions & 36 deletions ...ite-java/src/main/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.openrewrite.java.cleanup;

import org.openrewrite.Cursor;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Tree;
import org.openrewrite.internal.lang.Nullable;
Expand Down Expand Up @@ -52,49 +51,37 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {

if (asBinary.getOperator() == J.Binary.Type.And) {
if (isLiteralFalse(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getLeft();
} else if (isLiteralFalse(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getRight().withPrefix(asBinary.getRight().getPrefix().withWhitespace(""));
} else if (isLiteralTrue(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getRight();
} else if (isLiteralTrue(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getLeft().withPrefix(asBinary.getLeft().getPrefix().withWhitespace(""));
} else if (removeAllSpace(asBinary.getLeft()).printTrimmed(getCursor())
.equals(removeAllSpace(asBinary.getRight()).printTrimmed(getCursor()))) {
maybeUnwrapParentheses();
j = asBinary.getLeft();
}
} else if (asBinary.getOperator() == J.Binary.Type.Or) {
if (isLiteralTrue(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getLeft();
} else if (isLiteralTrue(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getRight().withPrefix(asBinary.getRight().getPrefix().withWhitespace(""));
} else if (isLiteralFalse(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getRight();
} else if (isLiteralFalse(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getLeft().withPrefix(asBinary.getLeft().getPrefix().withWhitespace(""));
} else if (removeAllSpace(asBinary.getLeft()).printTrimmed(getCursor())
.equals(removeAllSpace(asBinary.getRight()).printTrimmed(getCursor()))) {
maybeUnwrapParentheses();
j = asBinary.getLeft();
}
} else if (asBinary.getOperator() == J.Binary.Type.Equal) {
if (isLiteralTrue(asBinary.getLeft())) {
if (shouldSimplifyEqualsOn(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getRight().withPrefix(asBinary.getRight().getPrefix().withWhitespace(""));
}
} else if (isLiteralTrue(asBinary.getRight())) {
if (shouldSimplifyEqualsOn(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getLeft().withPrefix(asBinary.getLeft().getPrefix().withWhitespace(" "));
}
} else {
Expand All @@ -103,12 +90,10 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
} else if (asBinary.getOperator() == J.Binary.Type.NotEqual) {
if (isLiteralFalse(asBinary.getLeft())) {
if (shouldSimplifyEqualsOn(asBinary.getRight())) {
maybeUnwrapParentheses();
j = asBinary.getRight().withPrefix(asBinary.getRight().getPrefix().withWhitespace(""));
}
} else if (isLiteralFalse(asBinary.getRight())) {
if (shouldSimplifyEqualsOn(asBinary.getLeft())) {
maybeUnwrapParentheses();
j = asBinary.getLeft().withPrefix(asBinary.getLeft().getPrefix().withWhitespace(" "));
}
} else {
Expand All @@ -124,6 +109,9 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) {
@Override
public J postVisit(J tree, ExecutionContext ctx) {
J j = super.postVisit(tree, ctx);
if (j instanceof J.Parentheses) {
j = new UnwrapParentheses<>((J.Parentheses<?>) j).visit(j, ctx, getCursor().getParentOrThrow());
}
if (j != null && getCursor().pollMessage(MAYBE_AUTO_FORMAT_ME) != null) {
j = autoFormat(j, ctx);
}
Expand All @@ -137,13 +125,10 @@ public J visitUnary(J.Unary unary, ExecutionContext ctx) {

if (asUnary.getOperator() == J.Unary.Type.Not) {
if (isLiteralTrue(asUnary.getExpression())) {
maybeUnwrapParentheses();
j = ((J.Literal) asUnary.getExpression()).withValue(false).withValueSource("false");
} else if (isLiteralFalse(asUnary.getExpression())) {
maybeUnwrapParentheses();
j = ((J.Literal) asUnary.getExpression()).withValue(true).withValueSource("true");
} else if (asUnary.getExpression() instanceof J.Unary && ((J.Unary) asUnary.getExpression()).getOperator() == J.Unary.Type.Not) {
maybeUnwrapParentheses();
j = ((J.Unary) asUnary.getExpression()).getExpression();
}
}
Expand All @@ -163,27 +148,11 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext execu
if (isEmpty.matches(asMethod)
&& select instanceof J.Literal
&& select.getType() == JavaType.Primitive.String) {
maybeUnwrapParentheses();
return booleanLiteral(method, J.Literal.isLiteralValue(select, ""));
}
return j;
}

/**
* Specifically for removing immediately-enclosing parentheses on Identifiers and Literals.
* This queues a potential unwrap operation for the next visit. After unwrapping something, it's possible
* there are more Simplifications this recipe can identify and perform, which is why visitCompilationUnit
* checks for any changes to the entire Compilation Unit, and if so, queues up another SimplifyBooleanExpression
* recipe call. This convergence loop eventually reconciles any remaining Boolean Expression Simplifications
* the recipe can perform.
*/
private void maybeUnwrapParentheses() {
Cursor c = getCursor().getParentOrThrow().getParentTreeCursor();
if (c.getValue() instanceof J.Parentheses) {
doAfterVisit(new UnwrapParentheses<>(c.getValue()));
}
}

private boolean isLiteralTrue(@Nullable Expression expression) {
return expression instanceof J.Literal && ((J.Literal) expression).getValue() == Boolean.valueOf(true);
}
Expand All @@ -207,13 +176,11 @@ private J maybeReplaceCompareWithNull(J.Binary asBinary, boolean valueIfEqual) {
boolean leftIsNull = isNullLiteral(left);
boolean rightIsNull = isNullLiteral(right);
if (leftIsNull && rightIsNull) {
maybeUnwrapParentheses();
return booleanLiteral(asBinary, valueIfEqual);
}
boolean leftIsNonNullLiteral = isNonNullLiteral(left);
boolean rightIsNonNullLiteral = isNonNullLiteral(right);
if ((leftIsNull && rightIsNonNullLiteral) || (rightIsNull && leftIsNonNullLiteral)) {
maybeUnwrapParentheses();
return booleanLiteral(asBinary, !valueIfEqual);
}

Expand Down

0 comments on commit a9e347e

Please sign in to comment.