From 212f9a10539fa8ce3df1c465287504eaf28e2ebc Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Wed, 18 Oct 2023 16:24:29 +0200 Subject: [PATCH] Don't explicitly instantiate `AutoFormatVisitor` Instead use `autoFormat()` or `maybeAutoFormat()` which will delegate to the appropriate implementation (e.g. for Kotlin). --- .../java/cleanup/SimplifyBooleanExpressionVisitor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitor.java b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitor.java index a88312bed0f..4be59e179b4 100644 --- a/rewrite-java/src/main/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitor.java +++ b/rewrite-java/src/main/java/org/openrewrite/java/cleanup/SimplifyBooleanExpressionVisitor.java @@ -23,7 +23,6 @@ import org.openrewrite.java.JavaVisitor; import org.openrewrite.java.MethodMatcher; import org.openrewrite.java.UnwrapParentheses; -import org.openrewrite.java.format.AutoFormatVisitor; import org.openrewrite.java.tree.*; import java.util.Collections; @@ -125,8 +124,8 @@ public J visitBinary(J.Binary binary, ExecutionContext ctx) { @Override public J postVisit(J tree, ExecutionContext ctx) { J j = super.postVisit(tree, ctx); - if (getCursor().pollMessage(MAYBE_AUTO_FORMAT_ME) != null) { - j = new AutoFormatVisitor<>().visit(j, ctx, getCursor().getParentOrThrow()); + if (j != null && getCursor().pollMessage(MAYBE_AUTO_FORMAT_ME) != null) { + j = autoFormat(j, ctx); } return j; }