IDEA-178434 "Unwrap 'if' statement" produces incompilable code if variable declared in the if body shadows the outer scope variable

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

@@ -0,0 +1,13 @@
+// "Unwrap 'if' statement" "true"
+class X {
+    StringBuilder str = new StringBuilder();
+
+    void test(@org.jetbrains.annotations.NotNull String x) {
+        <caret>{
+            String str = x.trim();
+            System.out.println(str);
+        }
+
+        str.append("foo");
+    }
+}

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

@@ -0,0 +1,13 @@
+// "Unwrap 'if' statement" "true"
+class X {
+    StringBuilder str = new StringBuilder();
+
+    void test(@org.jetbrains.annotations.NotNull String x) {
+        if(x != <caret>null) {
+            String str = x.trim();
+            System.out.println(str);
+        }
+
+        str.append("foo");
+    }
+}