IDEA-169972 Smart Enter before else-if splits that else-if

java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java

@@ -43,7 +43,7 @@ public class MissingIfBranchesFixer implements Fixer {
   }
 
   private static void handleBranch(@NotNull Document doc, @NotNull PsiIfStatement ifStatement, @NotNull PsiElement beforeBranch, @Nullable PsiStatement branch) {
-    if (branch instanceof PsiBlockStatement) return;
+    if (branch instanceof PsiBlockStatement || beforeBranch.textMatches(PsiKeyword.ELSE) && branch instanceof PsiIfStatement) return;
     boolean transformingOneLiner = branch != null && (startLine(doc, beforeBranch) == startLine(doc, branch) ||
                                                       startCol(doc, ifStatement) < startCol(doc, branch));
 

java/java-tests/testData/codeInsight/completeStatement/BlockBeforeElseIf.java

@@ -0,0 +1,7 @@
+class Foo {
+    {
+        if (a) <caret>
+        else if (elsecond) {
+        }
+    }
+}

java/java-tests/testData/codeInsight/completeStatement/BlockBeforeElseIf_after.java

@@ -0,0 +1,8 @@
+class Foo {
+    {
+        if (a) {
+            <caret>
+        } else if (elsecond) {
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java

@@ -123,6 +123,8 @@ public class CompleteStatementTest extends EditorActionTestCase {
 
   public void testElseIf() throws Exception { doTest(); }
 
+  public void testBlockBeforeElseIf() { doTest(); }
+
   public void testIncompleteElseIf() throws Exception { doTest(); }
 
   public void testField() throws Exception { doTest(); }