IDEA-152224 Unwrap if should check if there are conflicting variables

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

@@ -0,0 +1,9 @@
+// "Unwrap 'if' statement" "true"
+class X {
+    void f() {
+        <caret>{
+            int i = 0;
+        }
+        int i = 0;
+    }
+}

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

@@ -0,0 +1,9 @@
+// "Unwrap 'if' statement" "true"
+class X {
+    void f() {
+        if (tru<caret>e) {
+            int i = 0;
+        }
+        int i = 0;
+    }
+}