SimplifyBooleanExpressionWithDeMorgan - Add parens when converting to OR (#660)

* Add parens when converting to OR

* ctx

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* ctx fixed

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: greg-at-moderne

src/main/java/org/openrewrite/staticanalysis/SimplifyBooleanExpressionWithDeMorgan.java

@@ -15,6 +15,8 @@
  */
 package org.openrewrite.staticanalysis;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.Tree;
@@ -95,13 +97,22 @@ public J visitUnary(J.Unary unary, ExecutionContext ctx) {
                         comments.addAll(parenthesesBinary.getComments());
                         comments.addAll(binary.getComments());
                         prefix = prefix.withComments(comments);
-                        binary = binary.withLeft(left).withRight(right).withOperator(newOperator).withPrefix(prefix);
-                        return new ParenthesizeVisitor<>().visit(binary, ctx);
+                        getCursor().getParent().putMessage("MIGHT_NEED_PARENTHESES", true);
+                        return binary.withLeft(left).withRight(right).withOperator(newOperator).withPrefix(prefix);
                     }
                 }
                 return requireNonNull(super.visitUnary(unary, ctx));
             }
 
+            @Override
+            public @Nullable J postVisit(@NonNull J tree, ExecutionContext ctx) {
+                J ret = super.postVisit(tree, ctx);
+                if (getCursor().pollMessage("MIGHT_NEED_PARENTHESES") != null) {
+                    return new ParenthesizeVisitor<>().visit(ret, ctx);
+                };
+                return ret;
+            }
+
             private Expression negate(Expression expression) {
                 if (expression instanceof J.Unary) {
                     J.Unary unaryExpr = (J.Unary) expression;

src/test/java/org/openrewrite/staticanalysis/SimplifyBooleanExpressionWithDeMorganTest.java

@@ -311,4 +311,25 @@ class Test {
           )
         );
     }
+
+    @Test
+    void mixedOperators2() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+            class Test {
+                boolean a, b, c;
+                boolean x = a && !(b && c);
+            }
+            """,
+            """
+            class Test {
+                boolean a, b, c;
+                boolean x = a && (!b || !c);
+            }
+            """
+          )
+        );
+    }
 }