Add braces: Remove new line between '}' and 'else' #KT-26839 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt

@@ -76,8 +76,12 @@ class AddBracesIntention : SelfTargetingIntention<KtElement>(KtElement::class.ja
 
         val result = expression.replace(psiFactory.createSingleStatementBlock(expression))
 
-        if (element is KtDoWhileExpression) { // remove new line between '}' and while
-            (element.body!!.parent.nextSibling as? PsiWhiteSpace)?.delete()
+        when (element) {
+            is KtDoWhileExpression ->
+                // remove new line between '}' and while
+                (element.body!!.parent.nextSibling as? PsiWhiteSpace)?.delete()
+            is KtIfExpression ->
+                (result?.parent?.nextSibling as? PsiWhiteSpace)?.delete()
         }
         saver.restore(result)
     }

idea/testData/intentions/addBraces/addBracesForIfWithIndent.kt

@@ -0,0 +1,10 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    <caret>if (i == 1)
+        doSomething(1)
+    else
+        doSomething(0)
+
+    doSomething(-1)
+}

idea/testData/intentions/addBraces/addBracesForIfWithIndent.kt.after

@@ -0,0 +1,10 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    if (i == 1) {
+        doSomething(1)
+    } else
+        doSomething(0)
+
+    doSomething(-1)
+}

idea/testData/intentions/addBraces/addBracesForIfWithIndent2.kt

@@ -0,0 +1,12 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    <caret>if (i == 1)
+        doSomething(1)
+
+
+    else
+        doSomething(0)
+
+    doSomething(-1)
+}

idea/testData/intentions/addBraces/addBracesForIfWithIndent2.kt.after

@@ -0,0 +1,10 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    if (i == 1) {
+        doSomething(1)
+    } else
+        doSomething(0)
+
+    doSomething(-1)
+}

idea/testData/intentions/addBraces/addBracesForIfWithIndent3.kt

@@ -0,0 +1,10 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    if (i == 1)
+        doSomething(1)
+    <caret>else
+        doSomething(0)
+
+    doSomething(-1)
+}

idea/testData/intentions/addBraces/addBracesForIfWithIndent3.kt.after

@@ -0,0 +1,11 @@
+fun <T> doSomething(a: T) {}
+
+fun foo(i: Int) {
+    if (i == 1)
+        doSomething(1)
+    else {
+        doSomething(0)
+    }
+
+    doSomething(-1)
+}

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -666,6 +666,21 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/addBraces/addBracesForIf.kt");
         }
 
+        @TestMetadata("addBracesForIfWithIndent.kt")
+        public void testAddBracesForIfWithIndent() throws Exception {
+            runTest("idea/testData/intentions/addBraces/addBracesForIfWithIndent.kt");
+        }
+
+        @TestMetadata("addBracesForIfWithIndent2.kt")
+        public void testAddBracesForIfWithIndent2() throws Exception {
+            runTest("idea/testData/intentions/addBraces/addBracesForIfWithIndent2.kt");
+        }
+
+        @TestMetadata("addBracesForIfWithIndent3.kt")
+        public void testAddBracesForIfWithIndent3() throws Exception {
+            runTest("idea/testData/intentions/addBraces/addBracesForIfWithIndent3.kt");
+        }
+
         @TestMetadata("addBracesForIfWithNoSpace.kt")
         public void testAddBracesForIfWithNoSpace() throws Exception {
             runTest("idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt");