Recover after problematic merge

This commit reverts 65a557bb38f6ac03afa9aabaf02cb8d99fc68a91
                    3f5cfd958d9b6b54393c15983ac94f519c37fe61

GitOrigin-RevId: 8fb8ccbb17d0e217a83f265c185a943b0f5a7ed6

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/simplifyBooleanExpression/afterPolyadicParens.java

@@ -0,0 +1,13 @@
+// "Simplify boolean expression" "true"
+class X {
+
+    void test(int a, int b) {
+        if (a + 1 + foo(a, b) > 5) {
+        }
+
+    }
+
+    private int foo(int a, int b) {
+        return a+b;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/simplifyBooleanExpression/beforePolyadicParens.java

@@ -0,0 +1,13 @@
+// "Simplify boolean expression" "true"
+class X {
+
+    void test(int a, int b) {
+        if (<caret>true && (a + 1) + foo((a), b) > 5) {
+        }
+
+    }
+
+    private int foo(int a, int b) {
+        return a+b;
+    }
+}