Fixed if-statements with else branch handling

idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt

@@ -47,6 +47,9 @@ public class JoinBlockIntoSingleStatementHandler : JoinRawLinesHandlerDelegate {
         // handle nested if's
         val pparent = parent.getParent()
         if (pparent is JetIfExpression && block == pparent.getThen() && statement is JetIfExpression && statement.getElse() == null) {
+            // if outer if has else-branch and inner does not have it, do not remove braces otherwise else-branch will belong to different if!
+            if (pparent.getElse() != null) return -1
+
             val condition1 = pparent.getCondition()
             val condition2 = statement.getCondition()
             val body = statement.getThen()

idea/testData/joinLines/nestedIfs/InnerWithElse.kt

@@ -0,0 +1,5 @@
+fun foo() {
+    <caret>if (a) {
+        if (b) foo() else bar()
+    }
+}

idea/testData/joinLines/nestedIfs/InnerWithElse.kt.after

@@ -0,0 +1,3 @@
+fun foo() {
+    if (a) <caret>if (b) foo() else bar()
+}

idea/testData/joinLines/nestedIfs/OuterWithElse.kt

@@ -0,0 +1,8 @@
+fun foo() {
+    <caret>if (a) {
+        if (b) foo()
+    }
+    else {
+        bar()
+    }
+}

idea/testData/joinLines/nestedIfs/OuterWithElse.kt.after

@@ -0,0 +1,7 @@
+fun foo() {
+    if (a) {<caret> if (b) foo()
+    }
+    else {
+        bar()
+    }
+}

idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java

@@ -174,6 +174,18 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
             doTest(fileName);
         }
 
+        @TestMetadata("InnerWithElse.kt")
+        public void testInnerWithElse() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/InnerWithElse.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("OuterWithElse.kt")
+        public void testOuterWithElse() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/OuterWithElse.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/nestedIfs/Simple.kt");