MoveIntoIfBranchesAction: conflict detection improved

GitOrigin-RevId: bf8c3d050e5cfa51e71d6e34921ab2c2036b8e5e

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveIntoIf/beforeDeclarationConflict2.java

@@ -0,0 +1,10 @@
+// "Move up into 'if' statement branches" "false"
+class X {
+  void test(int x) {
+    if (x > 0) System.out.println(">0"); else {
+      int y = 3;
+    }
+    <selection>{int y = x * 2;
+    System.out.println(y);}</selection>
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveIntoIf/beforeDeclarationConflictPattern.java

@@ -0,0 +1,9 @@
+// "Move up into 'if' statement branches" "false"
+class X {
+  void test(int x, Object obj) {
+    if (x > 0) System.out.println(">0"); else {
+      int y = 3;
+    }
+    <selection>if (obj instanceof String y) {}</selection>
+  }
+}