SimplifyBooleanExpressionFix: fix 'while' handling after ensureCodeBlock improvements

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterWhileWithSideEffects.java

@@ -0,0 +1,15 @@
+// "Remove 'while' statement extracting side effects" "true"
+import org.jetbrains.annotations.Contract;
+
+class X {
+    @Contract("_ -> true")
+    boolean test(Object obj) {
+        return true;
+    }
+
+    void doSmth(Object obj) {
+        if (obj != null) {
+            test(obj);
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/afterWhileWithSideEffects2.java

@@ -0,0 +1,16 @@
+// "Simplify 'test(...) || obj == null' to true extracting side effects" "true"
+import org.jetbrains.annotations.Contract;
+
+class X {
+    @Contract("_ -> true")
+    boolean test(Object obj) {
+        return true;
+    }
+
+    void doSmth(Object obj) {
+        while(obj != null) {
+            test(obj);
+            System.out.println("aaahh");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforeWhileWithSideEffects.java

@@ -0,0 +1,15 @@
+// "Remove 'while' statement extracting side effects" "true"
+import org.jetbrains.annotations.Contract;
+
+class X {
+    @Contract("_ -> true")
+    boolean test(Object obj) {
+        return true;
+    }
+
+    void doSmth(Object obj) {
+        while(obj <caret>!= null && test(obj) && obj == null) {
+            System.out.println("aaahh");
+        }
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/unwrapIfStatement/beforeWhileWithSideEffects2.java

@@ -0,0 +1,15 @@
+// "Simplify 'test(...) || obj == null' to true extracting side effects" "true"
+import org.jetbrains.annotations.Contract;
+
+class X {
+    @Contract("_ -> true")
+    boolean test(Object obj) {
+        return true;
+    }
+
+    void doSmth(Object obj) {
+        while(obj != null && (test(obj) <caret>|| obj == null)) {
+            System.out.println("aaahh");
+        }
+    }
+}