diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 3981bedbead..50cebfb33bf 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -214,12 +214,12 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             beforeInside(GT, TYPE_ARGUMENT_LIST).spaces(0)
             before(TYPE_ARGUMENT_LIST).spaces(0)
 
-            betweenInside(FOR_KEYWORD, LPAR, FOR).lineBreakOrForceSpace(false, kotlinCommonSettings.SPACE_BEFORE_FOR_PARENTHESES)
-            betweenInside(IF_KEYWORD, LPAR, IF).lineBreakOrForceSpace(false, kotlinCommonSettings.SPACE_BEFORE_IF_PARENTHESES)
-            betweenInside(WHILE_KEYWORD, LPAR, WHILE).lineBreakOrForceSpace(false, kotlinCommonSettings.SPACE_BEFORE_WHILE_PARENTHESES)
-            betweenInside(WHILE_KEYWORD, LPAR, DO_WHILE).lineBreakOrForceSpace(false, kotlinCommonSettings.SPACE_BEFORE_WHILE_PARENTHESES)
-            betweenInside(WHEN_KEYWORD, LPAR, WHEN).lineBreakOrForceSpace(false, kotlinSettings.SPACE_BEFORE_WHEN_PARENTHESES)
-            betweenInside(CATCH_KEYWORD, VALUE_PARAMETER_LIST, CATCH).lineBreakOrForceSpace(false, kotlinCommonSettings.SPACE_BEFORE_CATCH_PARENTHESES)
+            betweenInside(FOR_KEYWORD, LPAR, FOR).spaceIf(kotlinCommonSettings.SPACE_BEFORE_FOR_PARENTHESES)
+            betweenInside(IF_KEYWORD, LPAR, IF).spaceIf(kotlinCommonSettings.SPACE_BEFORE_IF_PARENTHESES)
+            betweenInside(WHILE_KEYWORD, LPAR, WHILE).spaceIf(kotlinCommonSettings.SPACE_BEFORE_WHILE_PARENTHESES)
+            betweenInside(WHILE_KEYWORD, LPAR, DO_WHILE).spaceIf(kotlinCommonSettings.SPACE_BEFORE_WHILE_PARENTHESES)
+            betweenInside(WHEN_KEYWORD, LPAR, WHEN).spaceIf(kotlinSettings.SPACE_BEFORE_WHEN_PARENTHESES)
+            betweenInside(CATCH_KEYWORD, VALUE_PARAMETER_LIST, CATCH).spaceIf(kotlinCommonSettings.SPACE_BEFORE_CATCH_PARENTHESES)
 
             betweenInside(LPAR, VALUE_PARAMETER, FOR).spaces(0)
             betweenInside(LPAR, DESTRUCTURING_DECLARATION, FOR).spaces(0)
diff --git a/idea/testData/formatter/DoWhileSpacing.after.kt b/idea/testData/formatter/DoWhileSpacing.after.kt
index 3f6483460ec..8348eae56e6 100644
--- a/idea/testData/formatter/DoWhileSpacing.after.kt
+++ b/idea/testData/formatter/DoWhileSpacing.after.kt
@@ -6,7 +6,8 @@ fun test() {
     } while (true)
 
     do {
-    } while (true)
+    } while
+            (true)
 
     do {
     } while (true)
diff --git a/idea/testData/formatter/ForSpacing.after.kt b/idea/testData/formatter/ForSpacing.after.kt
index a0f25a0fd01..67e74cdc8f9 100644
--- a/idea/testData/formatter/ForSpacing.after.kt
+++ b/idea/testData/formatter/ForSpacing.after.kt
@@ -3,10 +3,12 @@ fun f() {
     }
     for (i in array(1, 2)) {
     }
-    for (i in array(1, 2)) {
+    for
+    (i in array(1, 2)) {
     }
 
-    for (i in array(1, 2)) {
+    for
+    (i in array(1, 2)) {
     }
 
     for (i in array(1, 2)) continue
diff --git a/idea/testData/formatter/IfSpacing.after.kt b/idea/testData/formatter/IfSpacing.after.kt
index 2570789bcdb..145ecf094bf 100644
--- a/idea/testData/formatter/IfSpacing.after.kt
+++ b/idea/testData/formatter/IfSpacing.after.kt
@@ -3,7 +3,8 @@ fun f() {
     }
     if (1 == 2) {
     }
-    if (1 == 2) {
+    if
+            (1 == 2) {
     }
 
     if (true) {
diff --git a/idea/testData/formatter/When.after.inv.kt b/idea/testData/formatter/When.after.inv.kt
index d438d0d6c24..35089c73333 100644
--- a/idea/testData/formatter/When.after.inv.kt
+++ b/idea/testData/formatter/When.after.inv.kt
@@ -21,11 +21,15 @@ fun some(x: Any) {
 
     }
 
-    when (true) {
+    when
+    (true) {
 
     }
 
-    when (true) {
+    when
+
+
+    (true) {
 
     }
 
diff --git a/idea/testData/formatter/When.after.kt b/idea/testData/formatter/When.after.kt
index 7e4f33040b9..cc78bf0527f 100644
--- a/idea/testData/formatter/When.after.kt
+++ b/idea/testData/formatter/When.after.kt
@@ -21,11 +21,15 @@ fun some(x: Any) {
 
     }
 
-    when (true) {
+    when
+    (true) {
 
     }
 
-    when (true) {
+    when
+
+
+    (true) {
 
     }
 
diff --git a/idea/testData/formatter/WhileSpacing.after.kt b/idea/testData/formatter/WhileSpacing.after.kt
index 44b98d46f0f..b47223d0158 100644
--- a/idea/testData/formatter/WhileSpacing.after.kt
+++ b/idea/testData/formatter/WhileSpacing.after.kt
@@ -3,7 +3,8 @@ fun test() {
     }
     while (1 == 2) {
     }
-    while (1 == 2) {
+    while
+            (1 == 2) {
     }
 
     while (true) {