Formatter: force keyword to be on exactly next line if the corresponding option is set

idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt

@@ -67,11 +67,12 @@ class KotlinSpacingBuilder(val codeStyleSettings: CodeStyleSettings) {
             return this
         }
 
-        fun lineBreakIfLineBreakInParent(numSpacesOtherwise: Int) {
+        fun lineBreakIfLineBreakInParent(numSpacesOtherwise: Int, allowBlankLines: Boolean = true) {
             newRule {
                 p, l, r ->
                 Spacing.createDependentLFSpacing(numSpacesOtherwise, numSpacesOtherwise, p.getTextRange(),
-                                                 codeStyleSettings.KEEP_LINE_BREAKS, codeStyleSettings.KEEP_BLANK_LINES_IN_CODE)
+                                                 codeStyleSettings.KEEP_LINE_BREAKS,
+                                                 if (allowBlankLines) codeStyleSettings.KEEP_BLANK_LINES_IN_CODE else 0)
             }
         }
 
@@ -191,7 +192,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             fun CustomSpacingBuilder.ruleForKeywordOnNewLine(shouldBeOnNewLine: Boolean, keyword: IElementType, parent: IElementType) {
                 if (shouldBeOnNewLine) {
                     inPosition(parent = parent, right = keyword)
-                            .lineBreakIfLineBreakInParent(numSpacesOtherwise = 1)
+                            .lineBreakIfLineBreakInParent(numSpacesOtherwise = 1, allowBlankLines = false)
                 }
                 else {
                     inPosition(parent = parent, right = keyword).customRule {

idea/testData/formatter/CatchFinallyOnNewLine.after.inv.kt

@@ -8,6 +8,11 @@ fun f() {
     } catch (e: E) {
     } finally {
     }
+
+    try {
+    } catch (e: E) {
+    } finally {
+    }
 }
 
 // SET_TRUE: CATCH_ON_NEW_LINE

idea/testData/formatter/CatchFinallyOnNewLine.after.kt

@@ -12,6 +12,13 @@ fun f() {
     }
     finally {
     }
+
+    try {
+    }
+    catch (e: E) {
+    }
+    finally {
+    }
 }
 
 // SET_TRUE: CATCH_ON_NEW_LINE

idea/testData/formatter/CatchFinallyOnNewLine.kt

@@ -10,6 +10,15 @@ fun f() {
     } catch (e: E) {
     } finally {
     }
+
+    try {
+    }
+
+    catch (e: E) {
+    }
+
+    finally {
+    }
 }
 
 // SET_TRUE: CATCH_ON_NEW_LINE

idea/testData/formatter/ElseOnNewLine.after.inv.kt

@@ -5,6 +5,11 @@ fun f() {
     }
 
 
+    if (true) {
+    } else if (true) {
+    } else {
+    }
+
     if (true) {
     } else if (true) {
     } else {

idea/testData/formatter/ElseOnNewLine.after.kt

@@ -7,6 +7,13 @@ fun f() {
     }
 
 
+    if (true) {
+    }
+    else if (true) {
+    }
+    else {
+    }
+
     if (true) {
     }
     else if (true) {

idea/testData/formatter/ElseOnNewLine.kt

@@ -12,6 +12,15 @@ fun f() {
     } else {
     }
 
+    if (true) {
+    }
+
+    else if (true) {
+    }
+
+    else {
+    }
+
     if (a) 3 else 4
 
     if (a) 5

idea/testData/formatter/WhileOnNewLine.after.inv.kt

@@ -7,6 +7,10 @@ fun f() {
 
     } while (true)
 
+    do {
+
+    } while (true)
+
     do a += 1 while (true)
 
     do a += 1

idea/testData/formatter/WhileOnNewLine.after.kt

@@ -9,6 +9,11 @@ fun f() {
     }
     while (true)
 
+    do {
+
+    }
+    while (true)
+
     do a += 1 while (true)
 
     do a += 1

idea/testData/formatter/WhileOnNewLine.kt

@@ -8,6 +8,12 @@ fun f() {
     }
     while (true)
 
+    do {
+
+    }
+
+    while (true)
+
     do a += 1 while (true)
 
     do a += 1