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 e0708322e5d..975a4bc4807 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.idea.formatter.KotlinSpacingBuilder.CustomSpacingBui
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.lexer.KtTokens.*
 import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtFunction
 
 val MODIFIERS_LIST_ENTRIES = TokenSet.orSet(TokenSet.create(ANNOTATION_ENTRY, ANNOTATION), MODIFIER_KEYWORDS)
 
@@ -403,6 +404,25 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
             }
 
             inPosition(parent = CLASS_BODY, right = RBRACE).lineBreakIfLineBreakInParent(numSpacesOtherwise = 1)
+
+            inPosition(parent = BLOCK, right = RBRACE).customRule { block, left, right ->
+                val funNode = block.node.treeParent.psi as? KtFunction ?: return@customRule null
+                val empty = left.node.elementType == LBRACE
+                if (funNode.name != null && !empty) return@customRule null
+
+                val spaces = if (empty) 0 else spacesInSimpleFunction
+                Spacing.createDependentLFSpacing(spaces, spaces, funNode.textRange,
+                                                 codeStyleSettings.KEEP_LINE_BREAKS,
+                                                 codeStyleSettings.KEEP_BLANK_LINES_IN_CODE)
+            }
+
+            inPosition(parent = BLOCK, left = LBRACE).customRule { parent, left, right ->
+                val funNode = parent.node.treeParent.psi as? KtFunction ?: return@customRule null
+                if (funNode.name != null) return@customRule null
+                Spacing.createDependentLFSpacing(spacesInSimpleFunction, spacesInSimpleFunction, funNode.textRange,
+                                                 codeStyleSettings.KEEP_LINE_BREAKS,
+                                                 codeStyleSettings.KEEP_BLANK_LINES_IN_CODE)
+            }
         }
 
         simple {
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt
index 4b356e53a4e..19eb021f598 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt
@@ -48,6 +48,7 @@ class KotlinFunctionDeclarationBodyFixer : SmartEnterProcessorWithFixers.Fixer<K
             endOffset--
         }
 
-        doc.insertString(endOffset, "{}")
+        // Insert '\n' to force a multiline body, otherwise there will be an empty body on one line and a caret on the next one.
+        doc.insertString(endOffset, "{\n}")
     }
-}
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt
index 0afbeaeb1a7..e1b97a2fae3 100644
--- a/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt
+++ b/idea/testData/copyPaste/conversion/AddImportsWithExplicitImports.expected.kt
@@ -1,11 +1,9 @@
 import java.io.File
 
 internal class C {
-    private fun memberFun(file: File) {
-    }
+    private fun memberFun(file: File) {}
 
     companion object {
-        @JvmStatic fun main(args: Array<String>) {
-        }
+        @JvmStatic fun main(args: Array<String>) {}
     }
 }
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
index d92740a572c..95d8d80727a 100644
--- a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
@@ -1,11 +1,9 @@
 class A {
 
 
-    fun foo() {
-    }
+    fun foo() {}
 
-    fun bar() {
-    }
+    fun bar() {}
 
 
     fun f() {}
diff --git a/idea/testData/copyPaste/plainTextConversion/MembersIntoClass.expected.kt b/idea/testData/copyPaste/plainTextConversion/MembersIntoClass.expected.kt
index adcbc18d45b..4c881d0377c 100644
--- a/idea/testData/copyPaste/plainTextConversion/MembersIntoClass.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/MembersIntoClass.expected.kt
@@ -6,7 +6,6 @@ class A {
         list.add(1)
     }
 
-    fun bar() {
-    }
+    fun bar() {}
 
 }
\ No newline at end of file
diff --git a/idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.expected.kt b/idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.expected.kt
index e2af8984348..73aa6bc5693 100644
--- a/idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/MembersToTopLevel.expected.kt
@@ -8,5 +8,4 @@ fun foo() {
     list.add(1)
 }
 
-fun bar() {
-}
+fun bar() {}
diff --git a/idea/testData/copyPaste/plainTextConversion/Override.expected.kt b/idea/testData/copyPaste/plainTextConversion/Override.expected.kt
index 05818aefdcc..54502cbde89 100644
--- a/idea/testData/copyPaste/plainTextConversion/Override.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/Override.expected.kt
@@ -1,6 +1,5 @@
 import test.JavaParent
 
 class KotlinChild : JavaParent() {
-    override fun subject() {
-    }
+    override fun subject() {}
 }
\ No newline at end of file
diff --git a/idea/testData/copyPaste/plainTextConversion/OverrideInterface.expected.kt b/idea/testData/copyPaste/plainTextConversion/OverrideInterface.expected.kt
index b5f124b8376..9e9527856b3 100644
--- a/idea/testData/copyPaste/plainTextConversion/OverrideInterface.expected.kt
+++ b/idea/testData/copyPaste/plainTextConversion/OverrideInterface.expected.kt
@@ -1,6 +1,5 @@
 import test.JavaInterface
 
 class KotlinChild : JavaInterface() {
-    override fun subject(s: String?) {
-    }
+    override fun subject(s: String?) {}
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/AfterSemiColonInEnumClass.after.kt b/idea/testData/formatter/AfterSemiColonInEnumClass.after.kt
index 6f605e6c723..82e12ee3774 100644
--- a/idea/testData/formatter/AfterSemiColonInEnumClass.after.kt
+++ b/idea/testData/formatter/AfterSemiColonInEnumClass.after.kt
@@ -2,8 +2,7 @@ enum class E1 {
     A,
     B;
 
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 enum class E2 {
@@ -11,16 +10,14 @@ enum class E2 {
     B;
 
 
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 enum class E3 {
     A,
     B;
 
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 enum class E4 {
@@ -28,6 +25,5 @@ enum class E4 {
     B
     ;
 
-    fun foo() {
-    }
+    fun foo() {}
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt b/idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt
index 06699cc3f39..ca13118db74 100644
--- a/idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt
+++ b/idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt
@@ -1,5 +1,4 @@
-fun some(f: (String) -> Unit) {
-}
+fun some(f: (String) -> Unit) {}
 
 fun test() {
     3 + object {
diff --git a/idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt b/idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt
index 9ee7accb185..47c274a5e7b 100644
--- a/idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt
+++ b/idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt
@@ -1,13 +1,9 @@
-fun f1() {
-}
-
+fun f1() {}
 class C1 {}
 
 // -----
 
-fun f2() {
-}
-
+fun f2() {}
 class C2
 
 // -----
@@ -24,15 +20,13 @@ class C4
 
 class C5 {}
 
-fun f5() {
-}
+fun f5() {}
 
 // -----
 
 class C6
 
-fun f6() {
-}
+fun f6() {}
 
 // -----
 
diff --git a/idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt b/idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt
index 25894e48add..9f03cc5acec 100644
--- a/idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt
+++ b/idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt
@@ -3,29 +3,24 @@ fun f1() {
 }
 
 val p1 = 1
-fun f2() {
-}
+fun f2() {}
 
 fun f3() = 1
 val p2 = 1
 fun f4() = 1
 
-fun f4() {
-}
-
+fun f4() {}
 val p3: Int
     get() = 1
 
 fun f5() = 1
 
 class OneLine {
-    fun f1() {
-    }
+    fun f1() {}
 
     val p1 = 1
 
-    fun f2() {
-    }
+    fun f2() {}
 
     fun f3() = 1
 
@@ -33,8 +28,7 @@ class OneLine {
 
     fun f4() = 1
 
-    fun f4() {
-    }
+    fun f4() {}
 
     val p3: Int
         get() = 1
@@ -43,15 +37,13 @@ class OneLine {
 }
 
 class TwoLines {
-    fun f1() {
-    }
+    fun f1() {}
 
 
     val p1 = 1
 
 
-    fun f2() {
-    }
+    fun f2() {}
 
 
     fun f3() = 1
@@ -63,8 +55,7 @@ class TwoLines {
     fun f4() = 1
 
 
-    fun f4() {
-    }
+    fun f4() {}
 
 
     val p3: Int
diff --git a/idea/testData/formatter/EmptyLineBetweenFunctions.after.kt b/idea/testData/formatter/EmptyLineBetweenFunctions.after.kt
index 11e8c66a227..f46ebb22f8b 100644
--- a/idea/testData/formatter/EmptyLineBetweenFunctions.after.kt
+++ b/idea/testData/formatter/EmptyLineBetweenFunctions.after.kt
@@ -1,15 +1,9 @@
 // No lines between
 
-fun f2() {
-}
-
-fun f1() {
-}
-
+fun f2() {}
+fun f1() {}
 fun f3() = 1
-fun f4() {
-}
-
+fun f4() {}
 fun f5() {
 }
 
@@ -18,16 +12,13 @@ fun f7() = 8
 
 // One line
 
-fun f2() {
-}
+fun f2() {}
 
-fun f1() {
-}
+fun f1() {}
 
 fun f3() = 1
 
-fun f4() {
-}
+fun f4() {}
 
 fun f5() {
 }
@@ -41,15 +32,13 @@ fun l1() {
 }
 
 
-fun l2() {
-}
+fun l2() {}
 
 
 fun l3() = 1
 
 
-fun l4() {
-}
+fun l4() {}
 
 
 fun l5() {
diff --git a/idea/testData/formatter/FunctionExpression.after.kt b/idea/testData/formatter/FunctionExpression.after.kt
index ff172fefb15..3ee4ddcb10f 100644
--- a/idea/testData/formatter/FunctionExpression.after.kt
+++ b/idea/testData/formatter/FunctionExpression.after.kt
@@ -1,17 +1,13 @@
-val a = fun() {
-}
-val b = fun test() {
-}
+val a = fun() {}
+val b = fun test() {}
 
-val c = fun() {
-}
+val c = fun() {}
 val c = fun() = 4
 
 val c = fun() =
         4
 
-val c = fun() {
-}
+val c = fun() {}
 val c = fun() = 4
 
 fun test() = fun test() = 4
@@ -19,18 +15,29 @@ fun test() = fun test() = 4
 fun test() {
     test(fun() {
     })
-    test(fun test() {
-    })
+    test(fun test() {})
     test(fun test() = 5)
 
     test(fun test() = fun test(a: Int) = 2)
 
-    2.(fun test() {
-    })()
+    2.(fun test() {})()
 
     (fun() = 4)
-    (fun() {
-    })
+    (fun() {})
 
     test(fun test() = 4)
-}
\ No newline at end of file
+}
+
+fun d = fun(a: Int,
+            b: String) {
+}
+
+fun e = fun() {
+    val a = 1
+}
+
+fun f = fun() { foo() }
+
+val g: (String) -> Int = fun(p: String): Unit { /* comment */ /* other comment */ }
+
+fun foo() {}
\ No newline at end of file
diff --git a/idea/testData/formatter/FunctionExpression.kt b/idea/testData/formatter/FunctionExpression.kt
index fd52b7f2230..7eddbe7a0e1 100644
--- a/idea/testData/formatter/FunctionExpression.kt
+++ b/idea/testData/formatter/FunctionExpression.kt
@@ -27,4 +27,16 @@ fun test() {
     (fun(){})
 
     test(    fun     test     (    ) = 4   )
-}
\ No newline at end of file
+}
+
+fun d = fun(a: Int,
+            b: String) {}
+
+fun e = fun() {
+    val a = 1}
+
+fun f = fun() {foo()}
+
+val g: (String) -> Int = fun(p: String): Unit { /* comment */ /* other comment */ }
+
+fun foo() {}
\ No newline at end of file
diff --git a/idea/testData/formatter/FunctionLiteralsInChainCalls.kt b/idea/testData/formatter/FunctionLiteralsInChainCalls.kt
index 20de104580b..a453574a34f 100644
--- a/idea/testData/formatter/FunctionLiteralsInChainCalls.kt
+++ b/idea/testData/formatter/FunctionLiteralsInChainCalls.kt
@@ -42,4 +42,3 @@ fun testWithComments() {
         it > 4
     }
 }
-
diff --git a/idea/testData/formatter/NewLineForRBrace.after.kt b/idea/testData/formatter/NewLineForRBrace.after.kt
index 1d5bfe62f0c..800b6fe82ad 100644
--- a/idea/testData/formatter/NewLineForRBrace.after.kt
+++ b/idea/testData/formatter/NewLineForRBrace.after.kt
@@ -9,15 +9,13 @@ enum class E3 {
 class C1 {}
 
 class C2 {
-    fun test() {
-    }
+    fun test() {}
 }
 
 object O1 {}
 
 object O2 {
-    fun test() {
-    }
+    fun test() {}
 }
 
 interface T1 {}
@@ -32,3 +30,7 @@ enum class E1 {
         val some = 1
     }
 }
+
+fun e = fun(a: Int,
+            b: String) {
+}
diff --git a/idea/testData/formatter/NewLineForRBrace.kt b/idea/testData/formatter/NewLineForRBrace.kt
index a796f59153a..8256e87f416 100644
--- a/idea/testData/formatter/NewLineForRBrace.kt
+++ b/idea/testData/formatter/NewLineForRBrace.kt
@@ -25,3 +25,6 @@ enum class E1 {
     EE2 {
         val some = 1}
 }
+
+fun e = fun(a: Int,
+            b: String) {}
diff --git a/idea/testData/formatter/SecondaryConstructors.after.kt b/idea/testData/formatter/SecondaryConstructors.after.kt
index f69cddd0453..335b0018089 100644
--- a/idea/testData/formatter/SecondaryConstructors.after.kt
+++ b/idea/testData/formatter/SecondaryConstructors.after.kt
@@ -1,40 +1,28 @@
 class A {
-    constructor() {
-    }
+    constructor() {}
+    constructor() {}
 
-    constructor() {
-    }
-
-    fun foo() {
-    }
+    fun foo() {}
 
     constructor()
 
-    fun foo() {
-    }
+    fun foo() {}
 
-    constructor() {
-    }
+    constructor() {}
 
     val x = 1
 
-    constructor() {
-    }
-
-    fun foo() {
-    }
+    constructor() {}
 
+    fun foo() {}
     val x = 1
 
-    constructor() {
-    }
+    constructor() {}
 
     val x = 1
     val x = 1
 
-    constructor() {
-    }
-
+    constructor() {}
     constructor() {
 
         x = 1
@@ -42,30 +30,24 @@ class A {
 
     fun foo() = 1
 
-    constructor() {
-    }
+    constructor() {}
 
     fun foo() = 1
 
 
-    constructor() : this() {
-    }
-
-    constructor() : this() {
-    }
+    constructor() : this() {}
+    constructor() : this() {}
 
 
     constructor(a: Int) : this()
     constructor(a: Byte) : this()
     constructor() : this()
-    constructor() : super() {
-    }
+    constructor() : super() {}
 
 
     constructor() : this()
 
-    constructor() : super() {
-    }
+    constructor() : super() {}
 
     constructor() :
             this()
diff --git a/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt b/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt
index 2a6b0f7e7ed..21164f7c141 100644
--- a/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt
+++ b/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.inv.kt
@@ -1,15 +1,8 @@
 class A {
-    constructor() {
-    }
-
-    constructor(): this() {
-    }
-
-    constructor(): super() {
-    }
-
-    constructor(): super() {
-    }
+    constructor() {}
+    constructor(): this() {}
+    constructor(): super() {}
+    constructor(): super() {}
 }
 
 // SET_TRUE: SPACE_BEFORE_EXTEND_COLON
diff --git a/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt b/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt
index 1914b65f476..eb7822ad75e 100644
--- a/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt
+++ b/idea/testData/formatter/SpaceAroundExtendColonInSecondaryCtr.after.kt
@@ -1,15 +1,8 @@
 class A {
-    constructor() {
-    }
-
-    constructor() :this() {
-    }
-
-    constructor() :super() {
-    }
-
-    constructor() :super() {
-    }
+    constructor() {}
+    constructor() :this() {}
+    constructor() :super() {}
+    constructor() :super() {}
 }
 
 // SET_TRUE: SPACE_BEFORE_EXTEND_COLON
diff --git a/idea/testData/formatter/SpacesInDeclarations.after.kt b/idea/testData/formatter/SpacesInDeclarations.after.kt
index 40f2bc16cb6..28c87941c84 100644
--- a/idea/testData/formatter/SpacesInDeclarations.after.kt
+++ b/idea/testData/formatter/SpacesInDeclarations.after.kt
@@ -7,8 +7,7 @@ data class FooClass2
 
 //-----------------------
 
-public fun fooFun1() {
-}
+public fun fooFun1() {}
 
 public
 fun fooFun2() {
@@ -102,11 +101,8 @@ object FooObject2 {
 
 }
 
-fun <T> foo_1() {
-}
-
-fun <T> foo_2() {
-}
+fun <T> foo_1() {}
+fun <T> foo_2() {}
 
 fun
         <T>
diff --git a/idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.kt b/idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.kt
index 1e494e877c1..a7ca0d34899 100644
--- a/idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.kt
+++ b/idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.kt
@@ -1,5 +1,6 @@
 class C {
-fun foo0() {}
+fun foo0() {
+}
 
 private
 fun foo() {
diff --git a/idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.kt b/idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.kt
index 7d7f08fb169..da15b4ce0bd 100644
--- a/idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.kt
+++ b/idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.kt
@@ -1,5 +1,6 @@
 class C {
-fun foo0() {}
+fun foo0() {
+}
 
 private
 val foo = 1
diff --git a/idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt b/idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt
index 3aa5b3374fe..07bab6f6212 100644
--- a/idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt
+++ b/idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt
@@ -1,6 +1,5 @@
 class C {
-    fun foo0() {
-    }
+    fun foo0() {}
 
     private
     var foo = 1
diff --git a/idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt b/idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt
index c7a3cb1ba0f..2bb115fa159 100644
--- a/idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt
+++ b/idea/testData/formatter/secondaryCtorLineBreak.after.inv.kt
@@ -1,9 +1,6 @@
 class A {
-    constructor() {
-    }
-
-    constructor() : this() {
-    }
+    constructor() {}
+    constructor() : this() {}
 
     constructor() {
 
diff --git a/idea/testData/intentions/convertToBlockBody/funWithUnit.kt.after b/idea/testData/intentions/convertToBlockBody/funWithUnit.kt.after
index 661f3c98cd7..2f7ee97f7c4 100644
--- a/idea/testData/intentions/convertToBlockBody/funWithUnit.kt.after
+++ b/idea/testData/intentions/convertToBlockBody/funWithUnit.kt.after
@@ -1,2 +1 @@
-fun foo() {
-}
+fun foo() {}
diff --git a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
index 0dc7af4166c..59958ef927e 100644
--- a/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
+++ b/idea/testData/quickfix/abstract/nonAbstractFunctionWithNoBody.kt.after
@@ -1,5 +1,4 @@
 // "Add function body" "true"
 class A() {
-    fun <caret>foo() {
-    }
+    fun <caret>foo() {}
 }
diff --git a/idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after b/idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after
index 63779357b90..b44bad9cb90 100644
--- a/idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after
+++ b/idea/testData/quickfix/override/nothingToOverride/addFunction.kt.after
@@ -1,7 +1,6 @@
 // "Add 'open fun f()' to 'A'" "true"
 open class A {
-    open fun f() {
-    }
+    open fun f() {}
 }
 class B : A() {
     <caret>override fun f() {}
diff --git a/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after b/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after
index 6cd67f1f3cb..4c583ceb489 100644
--- a/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after
+++ b/idea/testData/quickfix/override/nothingToOverride/addFunctionInLocalDeclaration.kt.after
@@ -1,7 +1,6 @@
 // "Add 'open fun f()' to 'A'" "true"
 open class A {
-    open fun f() {
-    }
+    open fun f() {}
 }
 
 fun test() {
diff --git a/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after
index d151ba2fd15..8b493d816f3 100644
--- a/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after
+++ b/idea/testData/quickfix/override/nothingToOverride/addFunctionTwoSuperclasses.kt.after
@@ -2,8 +2,7 @@
 open class A {
 }
 open class B : A() {
-    open fun f() {
-    }
+    open fun f() {}
 }
 class C : B() {
     <caret>override fun f() {}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
index 11d00b0718d..9457056820a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -960,6 +960,16 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
             """
     )
 
+    fun testFunBody9() = doFileTest(
+            """
+            fun test(){<caret>}
+            """,
+            """
+            fun test() {}
+            <caret>
+            """
+    )
+
     fun testInLambda1() = doFunTest(
             """
             some {
diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
index ff24adb9bc1..462e08a3b63 100644
--- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt
+++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
@@ -27,6 +27,5 @@ internal class C {
         @Deprecated("") @Anon5(3) val c = 'a'
     }
 
-    @Anon5(1) fun bar() {
-    }
+    @Anon5(1) fun bar() {}
 }
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
index 56278e1d02c..03f3bad2bc3 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
@@ -3,8 +3,7 @@
 package test
 
 internal class Foo {
-    fun execute() {
-    }
+    fun execute() {}
 }
 
 internal class Bar {
diff --git a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
index 5be1e8e5db5..93916f9c047 100644
--- a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
+++ b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
@@ -1,2 +1 @@
-fun fromArrayToCollection(a: Array<Foo>) {
-}
\ No newline at end of file
+fun fromArrayToCollection(a: Array<Foo>) {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
index ef5bbcdc05c..bc198af6336 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
@@ -1,6 +1,5 @@
 internal object Library {
-    fun call() {
-    }
+    fun call() {}
 
     val string: String
         get() = ""
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
index 5e1c3388c67..40f6898ba47 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
@@ -1,8 +1,7 @@
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 internal class Library {
-    fun call() {
-    }
+    fun call() {}
 
     val string: String?
         get() = ""
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
index 4f5ecd203cb..f46ac268a63 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
@@ -1,6 +1,5 @@
 internal class Library {
-    fun call() {
-    }
+    fun call() {}
 
     val string: String
         get() = ""
diff --git a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
index e1a4ff4fab5..59aaee9cf53 100644
--- a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
+++ b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
@@ -1,10 +1,5 @@
 internal class T {
-    fun main() {
-    }
-
-    fun i(): Int {
-    }
-
-    fun s(): String {
-    }
+    fun main() {}
+    fun i(): Int {}
+    fun s(): String {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/kt-639.kt b/j2k/testData/fileOrElement/class/kt-639.kt
index 3c2b2a64e38..d803f3a4fbb 100644
--- a/j2k/testData/fileOrElement/class/kt-639.kt
+++ b/j2k/testData/fileOrElement/class/kt-639.kt
@@ -5,11 +5,8 @@ package demo
 import java.util.HashMap
 
 internal class Test {
-    constructor() {
-    }
-
-    constructor(s: String) {
-    }
+    constructor() {}
+    constructor(s: String) {}
 }
 
 internal class User {
diff --git a/j2k/testData/fileOrElement/class/notUtilityClass.kt b/j2k/testData/fileOrElement/class/notUtilityClass.kt
index 91f99d6cad1..c70a3466ad3 100644
--- a/j2k/testData/fileOrElement/class/notUtilityClass.kt
+++ b/j2k/testData/fileOrElement/class/notUtilityClass.kt
@@ -5,6 +5,5 @@ internal open class Base {
 }
 
 internal class Derived : Base() {
-    fun foo() {
-    }
-}
+    fun foo() {}
+}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/privateInit.kt b/j2k/testData/fileOrElement/class/privateInit.kt
index 6c44c8963eb..3db506099b5 100644
--- a/j2k/testData/fileOrElement/class/privateInit.kt
+++ b/j2k/testData/fileOrElement/class/privateInit.kt
@@ -1,4 +1,3 @@
 class MyClass {
-    private fun init(arg1: Int, arg2: Int, arg3: Int) {
-    }
+    private fun init(arg1: Int, arg2: Int, arg3: Int) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/utilityClass1.kt b/j2k/testData/fileOrElement/class/utilityClass1.kt
index 21be1031c97..801cb720711 100644
--- a/j2k/testData/fileOrElement/class/utilityClass1.kt
+++ b/j2k/testData/fileOrElement/class/utilityClass1.kt
@@ -1,9 +1,6 @@
 internal object Util {
-    fun util1() {
-    }
-
-    fun util2() {
-    }
+    fun util1() {}
+    fun util2() {}
 
     val CONSTANT = 10
-}
+}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/utilityClass2.kt b/j2k/testData/fileOrElement/class/utilityClass2.kt
index 141a8ac0043..dd7ae502d60 100644
--- a/j2k/testData/fileOrElement/class/utilityClass2.kt
+++ b/j2k/testData/fileOrElement/class/utilityClass2.kt
@@ -1,10 +1,7 @@
 internal object Util {
 
-    fun util1() {
-    }
-
-    fun util2() {
-    }
+    fun util1() {}
+    fun util2() {}
 
     val CONSTANT = 10
 }
diff --git a/j2k/testData/fileOrElement/class/utilityClass3.kt b/j2k/testData/fileOrElement/class/utilityClass3.kt
index 21be1031c97..5d2da046d4b 100644
--- a/j2k/testData/fileOrElement/class/utilityClass3.kt
+++ b/j2k/testData/fileOrElement/class/utilityClass3.kt
@@ -1,9 +1,6 @@
 internal object Util {
-    fun util1() {
-    }
-
-    fun util2() {
-    }
+    fun util1() {}
+    fun util2() {}
 
     val CONSTANT = 10
 }
diff --git a/j2k/testData/fileOrElement/comments/comments2.kt b/j2k/testData/fileOrElement/comments/comments2.kt
index 7caff5eaaaa..17a0573612d 100644
--- a/j2k/testData/fileOrElement/comments/comments2.kt
+++ b/j2k/testData/fileOrElement/comments/comments2.kt
@@ -14,11 +14,9 @@ internal class A {
 
     private /*it's private*/ val field = 0
 
-    /*it's public*/ fun foo(s: String): Char {
-    }
+    /*it's public*/ fun foo(s: String): Char {}
 
-    protected /*it's protected*/ fun foo(c: Char) {
-    }
+    protected /*it's protected*/ fun foo(c: Char) {}
 
     companion object {
 
diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
index bac40ad44de..607404c7373 100644
--- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
+++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
@@ -16,8 +16,7 @@ internal class B// this constructor will disappear
 (private val x: Int) // end of constructor body
 {
 
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 internal class CtorComment {
diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
index f95568d351e..3ef3e091bd5 100644
--- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt
+++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
@@ -7,11 +7,8 @@ internal class Customer(val firstName: String, val lastName: String) {
         doSmthAfter()
     }
 
-    private fun doSmthBefore() {
-    }
-
-    private fun doSmthAfter() {
-    }
+    private fun doSmthBefore() {}
+    private fun doSmthAfter() {}
 }
 
 internal class CustomerBuilder {
diff --git a/j2k/testData/fileOrElement/constructors/noPrimary.kt b/j2k/testData/fileOrElement/constructors/noPrimary.kt
index bc2c59cf6b1..bd651a1925c 100644
--- a/j2k/testData/fileOrElement/constructors/noPrimary.kt
+++ b/j2k/testData/fileOrElement/constructors/noPrimary.kt
@@ -1,8 +1,7 @@
 internal open class Base
 
 internal class C : Base {
-    constructor(arg1: Int, arg2: Int, arg3: Int) {
-    }
+    constructor(arg1: Int, arg2: Int, arg3: Int) {}
 
     constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         println()
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
index 73e9f76f6f8..75a7900f63c 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
@@ -2,6 +2,5 @@ package pack
 
 internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    constructor(a: Int) : this(a, 0, 0, 0, 1) {
-    }
+    constructor(a: Int) : this(a, 0, 0, 0, 1) {}
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
index 4c55f841f8b..52f6a3bb9a3 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
@@ -2,9 +2,7 @@ package pack
 
 internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
-    }
+    constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {}
 
-    constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {
-    }
+    constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {}
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
index 7d6115a5dfb..2fdf7ad418f 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
@@ -2,6 +2,5 @@ package pack
 
 internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
-    }
+    constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {}
 }
diff --git a/j2k/testData/fileOrElement/constructors/privateConstructors.kt b/j2k/testData/fileOrElement/constructors/privateConstructors.kt
index 45c14cd7d32..85c9e46f054 100644
--- a/j2k/testData/fileOrElement/constructors/privateConstructors.kt
+++ b/j2k/testData/fileOrElement/constructors/privateConstructors.kt
@@ -1,5 +1,4 @@
 internal class C private constructor(arg1: Int, arg2: Int, arg3: Int = 0) {
 
-    constructor(arg1: Int) : this(arg1, 0, 0) {
-    }
+    constructor(arg1: Int) : this(arg1, 0, 0) {}
 }
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt
index 6c1c523832b..e5c9720f76d 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt
@@ -4,8 +4,7 @@ internal class A {
     private val s = ""
     private val x = 0
 
-    constructor() {
-    }
+    constructor() {}
 
     @JvmOverloads constructor(p: Int, s: String, x: Int = 1) {
         this.s = s
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
index da24f657ddc..16638c5a930 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
@@ -1,51 +1,39 @@
 internal class Outer {
     private inner class Inner1() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     protected inner class Inner2() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
 
     }
 
     internal inner class Inner3() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     inner class Inner4() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     fun foo() {
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
index c2c3427079c..bbc9badc9b7 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
@@ -2,51 +2,39 @@
 internal object Outer {
     private class Nested1() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     protected class Nested2() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
 
     }
 
     internal class Nested3() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     class Nested4() {
 
-        constructor(a: Int) : this() {
-        }
+        constructor(a: Int) : this() {}
 
-        protected constructor(c: Char) : this() {
-        }
+        protected constructor(c: Char) : this() {}
 
-        private constructor(b: Boolean) : this() {
-        }
+        private constructor(b: Boolean) : this() {}
     }
 
     fun foo() {
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
index 975a77c3e82..eb8eccf718d 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
@@ -1,29 +1,21 @@
 internal class A() {
 
-    constructor(a: Int) : this() {
-    }
+    constructor(a: Int) : this() {}
 
-    protected constructor(c: Char) : this() {
-    }
+    protected constructor(c: Char) : this() {}
 
-    constructor(f: Float) : this() {
-    }
+    constructor(f: Float) : this() {}
 
-    private constructor(d: Double) : this() {
-    }
+    private constructor(d: Double) : this() {}
 }
 
 class B() {
 
-    constructor(a: Int) : this() {
-    }
+    constructor(a: Int) : this() {}
 
-    protected constructor(c: Char) : this() {
-    }
+    protected constructor(c: Char) : this() {}
 
-    internal constructor(f: Float) : this() {
-    }
+    internal constructor(f: Float) : this() {}
 
-    private constructor(d: Double) : this() {
-    }
+    private constructor(d: Double) : this() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt
index b14e24ca915..157db0877a8 100644
--- a/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt
+++ b/j2k/testData/fileOrElement/constructors/withManyDefaultParams.kt
@@ -9,8 +9,7 @@ class Test {
     protected var f: Short = 0
     protected var g: Char = ' '
 
-    constructor() {
-    }
+    constructor() {}
 
     constructor(name: String) {
         myName = foo(name)
diff --git a/j2k/testData/fileOrElement/detectProperties/Overrides.kt b/j2k/testData/fileOrElement/detectProperties/Overrides.kt
index e324840fc30..52e4b4b1032 100644
--- a/j2k/testData/fileOrElement/detectProperties/Overrides.kt
+++ b/j2k/testData/fileOrElement/detectProperties/Overrides.kt
@@ -39,8 +39,7 @@ internal open class B {
         set(value) {
         }
 
-    open fun setFromB5(value: String) {
-    }
+    open fun setFromB5(value: String) {}
 }
 
 internal abstract class C(override val something1: Int) : B(), I {
diff --git a/j2k/testData/fileOrElement/docComments/linkTag.kt b/j2k/testData/fileOrElement/docComments/linkTag.kt
index e8337e07ac8..c5aab085cee 100644
--- a/j2k/testData/fileOrElement/docComments/linkTag.kt
+++ b/j2k/testData/fileOrElement/docComments/linkTag.kt
@@ -2,6 +2,5 @@
  * [C.foo]
  */
 internal class C {
-    fun foo(i: Int) {
-    }
+    fun foo(i: Int) {}
 }
diff --git a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
index 2073328f9c6..3951d1ada76 100644
--- a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
+++ b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
@@ -2,6 +2,5 @@
  * [the best foo method ever][C.foo]
  */
 internal class C {
-    fun foo(i: Int) {
-    }
+    fun foo(i: Int) {}
 }
diff --git a/j2k/testData/fileOrElement/docComments/seeTag.kt b/j2k/testData/fileOrElement/docComments/seeTag.kt
index 30df04108cb..cfea09e2756 100644
--- a/j2k/testData/fileOrElement/docComments/seeTag.kt
+++ b/j2k/testData/fileOrElement/docComments/seeTag.kt
@@ -2,6 +2,5 @@
  * @see C.foo
  */
 internal class C {
-    fun foo(i: Int) {
-    }
+    fun foo(i: Int) {}
 }
diff --git a/j2k/testData/fileOrElement/enum/constantsWithBody1.kt b/j2k/testData/fileOrElement/enum/constantsWithBody1.kt
index fececb01de8..7e428f7df34 100644
--- a/j2k/testData/fileOrElement/enum/constantsWithBody1.kt
+++ b/j2k/testData/fileOrElement/enum/constantsWithBody1.kt
@@ -2,10 +2,8 @@ enum class E {
     A,
 
     B {
-        override fun bar() {
-        }
+        override fun bar() {}
     };
 
-    internal open fun bar() {
-    }
+    internal open fun bar() {}
 }
diff --git a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
index 75172425389..4b03f7df6e7 100644
--- a/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
+++ b/j2k/testData/fileOrElement/enum/constantsWithBody2.kt
@@ -7,12 +7,10 @@ enum class E private constructor(private val p: Int) {
     },
 
     B(2) {
-        override fun bar() {
-        }
+        override fun bar() {}
     };
 
-    internal fun foo(p: Int) {
-    }
+    internal fun foo(p: Int) {}
 
     internal abstract fun bar()
 }
diff --git a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
index 7c1cfdccae8..af66aa1a53c 100644
--- a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
+++ b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
@@ -1,6 +1,5 @@
 internal class F {
-    fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {
-    }
+    fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {}
 
     fun f2(array: IntArray) {
         f1(1, 2,
diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
index 8de4e02c3aa..868770e4d10 100644
--- a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
+++ b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
@@ -1,14 +1,10 @@
 internal class F {
 
-    fun f1() {
-    }
+    fun f1() {}
 
 
-    fun f2() {
-    }
-
+    fun f2() {}
     var i: Int? = 0
 
-    fun f3() {
-    }
+    fun f3() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
index de6458ba7cf..00580889f76 100644
--- a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
@@ -4,8 +4,7 @@ internal class F {
 
     /*c2*/
 
-    fun f1() {
-    }
+    fun f1() {}
 
 
     //c3
@@ -13,13 +12,10 @@ internal class F {
 
     //c4
 
-    fun f2() {
-    }
-
+    fun f2() {}
     var i: Int? = 0
 
-    fun f3() {
-    }
+    fun f3() {}
 
     //c5
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
index 595d0de453f..2aab9f0bb3d 100644
--- a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
@@ -6,14 +6,11 @@ internal class F {
 
     //c4
 
-    fun f2() {
-    }
+    fun f2() {}
 
-    fun f3() {
-    }
+    fun f3() {}
 
-    fun f4() {
-    }
+    fun f4() {}
 
     companion object {
 
@@ -21,15 +18,12 @@ internal class F {
 
         /*c2*/
 
-        fun f1() {
-        }
-
+        fun f1() {}
         var i: Int? = 0
 
         //c5
 
-        fun f5() {
-        }
+        fun f5() {}
     }
 
     //c6
diff --git a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
index 3672301c490..6b61e431ad6 100644
--- a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
@@ -4,8 +4,7 @@ internal object F {
 
     /*c2*/
 
-    fun f1() {
-    }
+    fun f1() {}
 
 
     //c3
@@ -13,13 +12,10 @@ internal object F {
 
     //c4
 
-    fun f2() {
-    }
-
+    fun f2() {}
     var i: Int? = 0
 
-    fun f3() {
-    }
+    fun f3() {}
 
     //c5
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
index e97bc7ec751..78e3db2779f 100644
--- a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
+++ b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
@@ -1,2 +1 @@
-fun main() {
-}
\ No newline at end of file
+fun main() {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/functionInFinalClass.kt b/j2k/testData/fileOrElement/function/functionInFinalClass.kt
index 57745eb444a..9e5cc77fd8e 100644
--- a/j2k/testData/fileOrElement/function/functionInFinalClass.kt
+++ b/j2k/testData/fileOrElement/function/functionInFinalClass.kt
@@ -1,6 +1,5 @@
 package demo
 
 internal class Final {
-    fun test() {
-    }
+    fun test() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/internal.kt b/j2k/testData/fileOrElement/function/internal.kt
index a7a0a149d8b..ab178dd5c6d 100644
--- a/j2k/testData/fileOrElement/function/internal.kt
+++ b/j2k/testData/fileOrElement/function/internal.kt
@@ -1,2 +1 @@
-fun test() {
-}
\ No newline at end of file
+fun test() {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/java8Lambdas.kt b/j2k/testData/fileOrElement/function/java8Lambdas.kt
index 1fa9fce4d2c..dcb002dad32 100644
--- a/j2k/testData/fileOrElement/function/java8Lambdas.kt
+++ b/j2k/testData/fileOrElement/function/java8Lambdas.kt
@@ -5,17 +5,13 @@
 // ERROR: 'return' is not allowed here
 // ERROR: Type mismatch: inferred type is String but Unit was expected
 class Java8Class {
-    fun foo0(r: Function0<String>) {
-    }
+    fun foo0(r: Function0<String>) {}
 
-    fun foo1(r: Function1<Int, String>) {
-    }
+    fun foo1(r: Function1<Int, String>) {}
 
-    fun foo2(r: Function2<Int, Int, String>) {
-    }
+    fun foo2(r: Function2<Int, Int, String>) {}
 
-    fun helper() {
-    }
+    fun helper() {}
 
     fun foo() {
         foo0 { "42" }
diff --git a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt
index f49a02030b9..84c4534531a 100644
--- a/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt
+++ b/j2k/testData/fileOrElement/function/java8MRSamConstructor.kt
@@ -8,11 +8,9 @@ internal class Test {
         return 1
     }
 
-    constructor(i: Int) : super() {
-    }
+    constructor(i: Int) : super() {}
 
-    constructor() {
-    }
+    constructor() {}
 
     companion object {
         var field = Java8Class()
diff --git a/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt b/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt
index 2933944a6b6..56dd17ab42d 100644
--- a/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt
+++ b/j2k/testData/fileOrElement/function/lineBreaksBetweenParameters.kt
@@ -1,6 +1,5 @@
 internal class C {
-    fun foo1(p1: Int, p2: Int) {
-    }
+    fun foo1(p1: Int, p2: Int) {}
 
     fun foo2(
             p1: Int,
@@ -16,4 +15,4 @@ internal class C {
             p3: Int, p4: Int
     ) {
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/main.kt b/j2k/testData/fileOrElement/function/main.kt
index bf42ac419b3..cf81fbf6226 100644
--- a/j2k/testData/fileOrElement/function/main.kt
+++ b/j2k/testData/fileOrElement/function/main.kt
@@ -1,2 +1 @@
-@JvmStatic fun main(args: Array<String>) {
-}
\ No newline at end of file
+@JvmStatic fun main(args: Array<String>) {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/main2.kt b/j2k/testData/fileOrElement/function/main2.kt
index f263509378b..f8fb44ebca5 100644
--- a/j2k/testData/fileOrElement/function/main2.kt
+++ b/j2k/testData/fileOrElement/function/main2.kt
@@ -1,4 +1,3 @@
 object A {
-    @JvmStatic fun main(args: Array<String>) {
-    }
+    @JvmStatic fun main(args: Array<String>) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
index 402a9981735..44b39deb49c 100644
--- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
+++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
@@ -1,5 +1,4 @@
 // !forceNotNullTypes: false
 object A {
-    @JvmStatic fun main(args: Array<String>) {
-    }
+    @JvmStatic fun main(args: Array<String>) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodClassType.kt b/j2k/testData/fileOrElement/function/methodClassType.kt
index 0124d08ad5b..137639e0856 100644
--- a/j2k/testData/fileOrElement/function/methodClassType.kt
+++ b/j2k/testData/fileOrElement/function/methodClassType.kt
@@ -1,2 +1 @@
-fun main(): String {
-}
\ No newline at end of file
+fun main(): String {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
index bf6eb1424e4..4ecdc3549fa 100644
--- a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
+++ b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
@@ -1,2 +1 @@
-fun main(): Int {
-}
\ No newline at end of file
+fun main(): Int {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
index 388e4288f4c..ee5bc8fe0a2 100644
--- a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
+++ b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
@@ -1,2 +1 @@
-fun main(): Boolean {
-}
\ No newline at end of file
+fun main(): Boolean {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/override.kt b/j2k/testData/fileOrElement/function/override.kt
index 83325a430b1..c7a25b8546a 100644
--- a/j2k/testData/fileOrElement/function/override.kt
+++ b/j2k/testData/fileOrElement/function/override.kt
@@ -1,9 +1,7 @@
 internal open class A {
-    internal open fun a() {
-    }
+    internal open fun a() {}
 }
 
 internal class B : A() {
-    override fun a() {
-    }
+    override fun a() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/overrideAndOpen.kt b/j2k/testData/fileOrElement/function/overrideAndOpen.kt
index 9344695aec3..c2167b581a1 100644
--- a/j2k/testData/fileOrElement/function/overrideAndOpen.kt
+++ b/j2k/testData/fileOrElement/function/overrideAndOpen.kt
@@ -1,14 +1,11 @@
 internal open class A {
-    internal open fun foo() {
-    }
+    internal open fun foo() {}
 }
 
 internal open class B : A() {
-    override fun foo() {
-    }
+    override fun foo() {}
 }
 
 internal class C : B() {
-    override fun foo() {
-    }
+    override fun foo() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/overrideWithHigherVisibility.kt b/j2k/testData/fileOrElement/function/overrideWithHigherVisibility.kt
index 91abbeffb62..ed0ca4366a7 100644
--- a/j2k/testData/fileOrElement/function/overrideWithHigherVisibility.kt
+++ b/j2k/testData/fileOrElement/function/overrideWithHigherVisibility.kt
@@ -1,6 +1,5 @@
 internal open class Base {
-    protected open fun foo() {
-    }
+    protected open fun foo() {}
 }
 
 internal class Derived : Base() {
diff --git a/j2k/testData/fileOrElement/function/ownGenericParam.kt b/j2k/testData/fileOrElement/function/ownGenericParam.kt
index e0a4fa6e530..59e72c209a5 100644
--- a/j2k/testData/fileOrElement/function/ownGenericParam.kt
+++ b/j2k/testData/fileOrElement/function/ownGenericParam.kt
@@ -1,2 +1 @@
-fun <U> putU(u: U) {
-}
\ No newline at end of file
+fun <U> putU(u: U) {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
index 6f04d1b814f..5fcfd22be51 100644
--- a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
+++ b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
@@ -1,2 +1 @@
-fun <U, V, W> putUVW(u: U, v: V, w: W) {
-}
\ No newline at end of file
+fun <U, V, W> putUVW(u: U, v: V, w: W) {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/private.kt b/j2k/testData/fileOrElement/function/private.kt
index dd4bde284eb..5295ed4cc4a 100644
--- a/j2k/testData/fileOrElement/function/private.kt
+++ b/j2k/testData/fileOrElement/function/private.kt
@@ -1,2 +1 @@
-private fun test() {
-}
\ No newline at end of file
+private fun test() {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/protected.kt b/j2k/testData/fileOrElement/function/protected.kt
index 992d26c14fe..143ed590d85 100644
--- a/j2k/testData/fileOrElement/function/protected.kt
+++ b/j2k/testData/fileOrElement/function/protected.kt
@@ -1,2 +1 @@
-protected fun test() {
-}
\ No newline at end of file
+protected fun test() {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/public.kt b/j2k/testData/fileOrElement/function/public.kt
index a7a0a149d8b..ab178dd5c6d 100644
--- a/j2k/testData/fileOrElement/function/public.kt
+++ b/j2k/testData/fileOrElement/function/public.kt
@@ -1,2 +1 @@
-fun test() {
-}
\ No newline at end of file
+fun test() {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/synchronizedMethod.kt b/j2k/testData/fileOrElement/function/synchronizedMethod.kt
index e02fe07935f..aeb8c131a29 100644
--- a/j2k/testData/fileOrElement/function/synchronizedMethod.kt
+++ b/j2k/testData/fileOrElement/function/synchronizedMethod.kt
@@ -3,6 +3,5 @@ internal class A {
         bar()
     }
 
-    fun bar() {
-    }
+    fun bar() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/inheritance/openModifier.kt b/j2k/testData/fileOrElement/inheritance/openModifier.kt
index ad21b07a913..a510d3adaed 100644
--- a/j2k/testData/fileOrElement/inheritance/openModifier.kt
+++ b/j2k/testData/fileOrElement/inheritance/openModifier.kt
@@ -1,14 +1,9 @@
 import java.lang.Void
 
 internal open class A {
-    open fun f1() {
-    }
-
-    fun f2() {
-    }
-
-    private fun f3() {
-    }
+    open fun f1() {}
+    fun f2() {}
+    private fun f3() {}
 }
 
 internal open class B : A() {
@@ -28,22 +23,17 @@ internal interface I {
 }
 
 internal class D : I {
-    override fun f() {
-    }
+    override fun f() {}
 }
 
 internal abstract class E {
     internal abstract fun f1()
-    internal open fun f2() {
-    }
-
-    fun f3() {
-    }
+    internal open fun f2() {}
+    fun f3() {}
 }
 
 internal class F : E() {
-    override fun f1() {
-    }
+    override fun f1() {}
 
     override fun f2() {
         super.f2()
diff --git a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
index 5ac56a9c663..3334d1aa2cb 100644
--- a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
@@ -1,8 +1,7 @@
 package demo
 
 internal class Test {
-    fun putInt(i: Int?) {
-    }
+    fun putInt(i: Int?) {}
 
     fun test() {
         val b: Byte = 10
diff --git a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
index 5b39dab8fd9..05e685d3d5d 100644
--- a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
@@ -1,8 +1,7 @@
 package demo
 
 internal class Test {
-    fun putInt(i: Int?) {
-    }
+    fun putInt(i: Int?) {}
 
     fun test() {
         val i = 10
diff --git a/j2k/testData/fileOrElement/issues/kt-543.kt b/j2k/testData/fileOrElement/issues/kt-543.kt
index 26dfffa5885..d8660a44eb2 100644
--- a/j2k/testData/fileOrElement/issues/kt-543.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543.kt
@@ -1,8 +1,7 @@
 package demo
 
 internal class Test {
-    fun putInt(i: Int) {
-    }
+    fun putInt(i: Int) {}
 
     fun test() {
         val b: Byte = 10
diff --git a/j2k/testData/fileOrElement/issues/kt-809-string.kt b/j2k/testData/fileOrElement/issues/kt-809-string.kt
index 46f5937b242..b264b142c9b 100644
--- a/j2k/testData/fileOrElement/issues/kt-809-string.kt
+++ b/j2k/testData/fileOrElement/issues/kt-809-string.kt
@@ -11,9 +11,7 @@ internal object One {
 internal class StringContainer(s: String)
 
 internal class Test {
-    fun putString(s: String) {
-    }
-
+    fun putString(s: String) {}
     fun test() {
         putString(One.myContainer.myString)
         StringContainer(One.myContainer.myString)
diff --git a/j2k/testData/fileOrElement/issues/kt-809.kt b/j2k/testData/fileOrElement/issues/kt-809.kt
index 145cfb26537..82f97f14710 100644
--- a/j2k/testData/fileOrElement/issues/kt-809.kt
+++ b/j2k/testData/fileOrElement/issues/kt-809.kt
@@ -11,9 +11,7 @@ internal object One {
 internal class IntContainer(i: Int)
 
 internal class Test {
-    fun putInt(i: Int) {
-    }
-
+    fun putInt(i: Int) {}
     fun test() {
         putInt(One.myContainer.myInt)
         IntContainer(One.myContainer.myInt)
diff --git a/j2k/testData/fileOrElement/issues/kt-836.kt b/j2k/testData/fileOrElement/issues/kt-836.kt
index d69dba75102..ac04dbdf3d0 100644
--- a/j2k/testData/fileOrElement/issues/kt-836.kt
+++ b/j2k/testData/fileOrElement/issues/kt-836.kt
@@ -11,18 +11,14 @@ class Language(protected var code: String) : Serializable {
 
 
 internal open class Base {
-    internal open fun test() {
-    }
-
+    internal open fun test() {}
     override fun toString(): String {
         return "BASE"
     }
 }
 
 internal class Child : Base() {
-    override fun test() {
-    }
-
+    override fun test() {}
     override fun toString(): String {
         return "Child"
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-851.kt b/j2k/testData/fileOrElement/issues/kt-851.kt
index e0ff1016237..2a79008b988 100644
--- a/j2k/testData/fileOrElement/issues/kt-851.kt
+++ b/j2k/testData/fileOrElement/issues/kt-851.kt
@@ -1,6 +1,5 @@
 internal class Test {
-    fun putInt(i: Int) {
-    }
+    fun putInt(i: Int) {}
 
     fun test() {
         val b = 10
diff --git a/j2k/testData/fileOrElement/issues/kt-9997.kt b/j2k/testData/fileOrElement/issues/kt-9997.kt
index e2987b1265b..7d7eeb3faa2 100644
--- a/j2k/testData/fileOrElement/issues/kt-9997.kt
+++ b/j2k/testData/fileOrElement/issues/kt-9997.kt
@@ -133,6 +133,5 @@ internal class A {
         t(c > c)
     }
 
-    private fun t(b: Boolean) {
-    }
+    private fun t(b: Boolean) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/operationsWithChar.kt b/j2k/testData/fileOrElement/issues/operationsWithChar.kt
index 2a2a8ddbf32..b8de68100fd 100644
--- a/j2k/testData/fileOrElement/issues/operationsWithChar.kt
+++ b/j2k/testData/fileOrElement/issues/operationsWithChar.kt
@@ -39,9 +39,6 @@ internal class Test {
         i(c.toInt() shr i)
     }
 
-    fun b(b: Boolean) {
-    }
-
-    fun i(i: Int) {
-    }
+    fun b(b: Boolean) {}
+    fun i(i: Int) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/literalExpression/double.kt b/j2k/testData/fileOrElement/literalExpression/double.kt
index 083852fdf51..d51d3b1c0c8 100644
--- a/j2k/testData/fileOrElement/literalExpression/double.kt
+++ b/j2k/testData/fileOrElement/literalExpression/double.kt
@@ -10,11 +10,8 @@ internal class A {
     private val d9 = 1.0
     private val x = 1 / (1.0 + 0)
 
-    fun foo1(d: Double) {
-    }
-
-    fun foo2(d: Double?) {
-    }
+    fun foo1(d: Double) {}
+    fun foo2(d: Double?) {}
 
     fun bar() {
         foo1(1.0)
diff --git a/j2k/testData/fileOrElement/literalExpression/float.kt b/j2k/testData/fileOrElement/literalExpression/float.kt
index e52952b98e5..6cc393cdeb6 100644
--- a/j2k/testData/fileOrElement/literalExpression/float.kt
+++ b/j2k/testData/fileOrElement/literalExpression/float.kt
@@ -10,11 +10,8 @@ internal class A {
     private val f9 = 1f
     private val f10 = 1f
 
-    fun foo1(f: Float) {
-    }
-
-    fun foo2(f: Float?) {
-    }
+    fun foo1(f: Float) {}
+    fun foo2(f: Float?) {}
 
     fun bar() {
         foo1(1f)
diff --git a/j2k/testData/fileOrElement/literalExpression/long.kt b/j2k/testData/fileOrElement/literalExpression/long.kt
index 209d6667404..f71a84beb4c 100644
--- a/j2k/testData/fileOrElement/literalExpression/long.kt
+++ b/j2k/testData/fileOrElement/literalExpression/long.kt
@@ -8,11 +8,8 @@ internal class A {
     private val l7: Long = +1
     private val l8 = +1L
 
-    fun foo1(l: Long) {
-    }
-
-    fun foo2(l: Long?) {
-    }
+    fun foo1(l: Long) {}
+    fun foo2(l: Long?) {}
 
     fun bar() {
         foo1(1)
diff --git a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
index 1dfb4fac31a..53c37030ee7 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
@@ -1,8 +1,7 @@
 package demo
 
 internal class Map {
-    fun <K, V> put(k: K?, v: V) {
-    }
+    fun <K, V> put(k: K?, v: V) {}
 }
 
 internal class U {
diff --git a/j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt b/j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt
index 04d97c5404c..b3a8f3ef732 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/stringMethods.kt
@@ -138,6 +138,5 @@ internal class A {
         */
     }
 
-    fun useSplit(result: Array<String>) {
-    }
+    fun useSplit(result: Array<String>) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
index f4902233a25..a4bdcb960bc 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
@@ -1,6 +1,5 @@
 internal class C {
-    private fun foo(s: String?) {
-    }
+    private fun foo(s: String?) {}
 
     fun bar() {
         foo(null)
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
index 972696f68ce..3d23fbfd9d3 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
@@ -1,6 +1,5 @@
 internal class C {
-    fun foo(s: String?) {
-    }
+    fun foo(s: String?) {}
 }
 
 internal class D {
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
index bb8439e71c9..4c5b7c16861 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
@@ -1,6 +1,5 @@
 internal class C {
-    private fun foo(s: String?) {
-    }
+    private fun foo(s: String?) {}
 
     fun bar(b: Boolean) {
         foo(if (b) "a" else null)
diff --git a/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt b/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt
index db6e85e9a42..135a7c08da9 100644
--- a/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt
+++ b/j2k/testData/fileOrElement/nullability/OverrideWithInheritanceLoop.kt
@@ -1,11 +1,9 @@
 // ERROR: There's a cycle in the inheritance hierarchy for this type
 // ERROR: There's a cycle in the inheritance hierarchy for this type
 internal open class A : B() {
-    open fun foo(s: String) {
-    }
+    open fun foo(s: String) {}
 }
 
 internal open class B : A() {
-    open fun foo(s: String) {
-    }
+    open fun foo(s: String) {}
 }
diff --git a/j2k/testData/fileOrElement/nullability/notNullCast.kt b/j2k/testData/fileOrElement/nullability/notNullCast.kt
index b81a0db3eee..c883a2db8e4 100644
--- a/j2k/testData/fileOrElement/nullability/notNullCast.kt
+++ b/j2k/testData/fileOrElement/nullability/notNullCast.kt
@@ -23,9 +23,7 @@ class Passenger {
         accept2(pass as PassChild?)
     }
 
-    fun accept1(p: PassChild) {
-    }
+    fun accept1(p: PassChild) {}
 
-    fun accept2(p: PassChild) {
-    }
+    fun accept2(p: PassChild) {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
index f67e01524d2..31b3ddc7024 100644
--- a/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
+++ b/j2k/testData/fileOrElement/objectLiteral/MyFrame.kt
@@ -8,27 +8,23 @@ internal interface EmptyWindowListener
 internal open class EmptyWindowAdapter
 
 internal open class WindowAdapter : WindowListener {
-    override fun windowClosing() {
-    }
+    override fun windowClosing() {}
 }
 
 internal open class Frame {
-    fun addWindowListener(listener: WindowListener) {
-    }
+    fun addWindowListener(listener: WindowListener) {}
 }
 
 internal class Client : Frame() {
     init {
         val a = object : WindowAdapter() {
-            override fun windowClosing() {
-            }
+            override fun windowClosing() {}
         }
 
         addWindowListener(a)
 
         addWindowListener(object : WindowAdapter() {
-            override fun windowClosing() {
-            }
+            override fun windowClosing() {}
         })
 
         val b = object : EmptyWindowListener {
diff --git a/j2k/testData/fileOrElement/overloads/Override.kt b/j2k/testData/fileOrElement/overloads/Override.kt
index 5c3191971ed..a575b6a1243 100644
--- a/j2k/testData/fileOrElement/overloads/Override.kt
+++ b/j2k/testData/fileOrElement/overloads/Override.kt
@@ -20,22 +20,19 @@ internal open class A : I {
         bar(1)
     }
 
-    fun bar(i: Int) {
-    }
+    fun bar(i: Int) {}
 
     open fun x() {
         x(1)
     }
 
-    fun x(i: Int) {
-    }
+    fun x(i: Int) {}
 
     fun y() {
         y(1)
     }
 
-    open fun y(i: Int) {
-    }
+    open fun y(i: Int) {}
 }
 
 internal class B : A() {
diff --git a/j2k/testData/fileOrElement/projections/projections.kt b/j2k/testData/fileOrElement/projections/projections.kt
index eff8c4b5923..d3115c045f2 100644
--- a/j2k/testData/fileOrElement/projections/projections.kt
+++ b/j2k/testData/fileOrElement/projections/projections.kt
@@ -17,6 +17,5 @@ internal class C<T> {
         return comparable.compareTo(t)
     }
 
-    fun foo5(w: Collection<*>) {
-    }
+    fun foo5(w: Collection<*>) {}
 }
diff --git a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
index d76ff61305c..6be2c6454ee 100644
--- a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
@@ -1,8 +1,7 @@
 package demo
 
 internal class TestT {
-    fun <T> getT() {
-    }
+    fun <T> getT() {}
 }
 
 internal class U {
diff --git a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
index a75bd8d1c0a..0c85e810f98 100644
--- a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
+++ b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
@@ -12,8 +12,7 @@ internal class C {
             return string
         }
 
-    fun foo(i: I) {
-    }
+    fun foo(i: I) {}
 
     var string: String? = null
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/settings/openByDefault.kt b/j2k/testData/fileOrElement/settings/openByDefault.kt
index ceb0c110edc..1d0ff34863e 100644
--- a/j2k/testData/fileOrElement/settings/openByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/openByDefault.kt
@@ -1,19 +1,13 @@
 // !openByDefault: true
 
 internal open class A {
-    internal open fun foo1() {
-    }
-
-    private fun foo2() {
-    }
-
-    fun foo3() {
-    }
+    internal open fun foo1() {}
+    private fun foo2() {}
+    fun foo3() {}
 }
 
 internal class B {
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 internal abstract class C {
@@ -25,8 +19,7 @@ internal interface I {
 }
 
 internal open class D : I {
-    override fun foo() {
-    }
+    override fun foo() {}
 }
 
 internal enum class E {
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt
index 10644b205b5..d905ebfb77e 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMembers.kt
@@ -8,10 +8,7 @@ internal class A {
     companion object {
         private val s = "abc"
 
-        private fun privateStatic1() {
-        }
-
-        private fun privateStatic2() {
-        }
+        private fun privateStatic1() {}
+        private fun privateStatic2() {}
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt
index e5258619042..e3168a1c01e 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods1.kt
@@ -4,9 +4,6 @@ internal class A {
         privateStatic2()
     }
 
-    private fun privateStatic1() {
-    }
-
-    private fun privateStatic2() {
-    }
+    private fun privateStatic1() {}
+    private fun privateStatic2() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt
index 3a5399b7504..5abdaccf393 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods2.kt
@@ -10,10 +10,7 @@ internal class A {
             privateStatic1()
         }
 
-        private fun privateStatic1() {
-        }
-
-        private fun privateStatic2() {
-        }
+        private fun privateStatic1() {}
+        private fun privateStatic2() {}
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
index 8093bfa3fba..043ad0f2fb7 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
@@ -11,10 +11,7 @@ internal class A {
 
     companion object {
 
-        private fun privateStatic1() {
-        }
-
-        private fun privateStatic2() {
-        }
+        private fun privateStatic1() {}
+        private fun privateStatic2() {}
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
index 6d1b32d09c4..4274f5ea773 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
@@ -9,9 +9,6 @@ internal class A {
         privateStatic2()
     }
 
-    private fun privateStatic1() {
-    }
-
-    private fun privateStatic2() {
-    }
+    private fun privateStatic1() {}
+    private fun privateStatic2() {}
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
index 68b2ca3fc2f..e4a2ce4fdd4 100644
--- a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
+++ b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
@@ -1,8 +1,7 @@
 package a.b
 
 internal open class Base {
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 internal class A : Base() {
diff --git a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
index 650054ee114..07ea64b077b 100644
--- a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
+++ b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
@@ -1,8 +1,7 @@
 package a.b
 
 internal open class Base {
-    fun foo() {
-    }
+    fun foo() {}
 }
 
 internal class A : Base() {
diff --git a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
index 6a7b22e6666..95cb0483f6c 100644
--- a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
+++ b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
@@ -1,2 +1 @@
-fun <T : Any, K : Node> max(coll: Collection<T>): T where T : Comparable<T>, K : Collection<in K> {
-}
\ No newline at end of file
+fun <T : Any, K : Node> max(coll: Collection<T>): T where T : Comparable<T>, K : Collection<in K> {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/typeParameters/where.kt b/j2k/testData/fileOrElement/typeParameters/where.kt
index 4c6e6f81c15..56479cd8512 100644
--- a/j2k/testData/fileOrElement/typeParameters/where.kt
+++ b/j2k/testData/fileOrElement/typeParameters/where.kt
@@ -1,2 +1 @@
-fun <T : Any> max(coll: Collection<T>): T where T : Comparable<T> {
-}
\ No newline at end of file
+fun <T : Any> max(coll: Collection<T>): T where T : Comparable<T> {}
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
index e1403964927..02a7e5c77de 100644
--- a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
+++ b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
@@ -1,2 +1 @@
-fun pushAll(vararg objs: Any) {
-}
\ No newline at end of file
+fun pushAll(vararg objs: Any) {}
\ No newline at end of file
diff --git a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
index fe099452d83..07d5da14a4e 100644
--- a/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
+++ b/j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt
@@ -1,13 +1,11 @@
 package test
 
 internal open class ClassWithStatics {
-    fun instanceMethod() {
-    }
+    fun instanceMethod() {}
 
     companion object {
 
-        fun staticMethod(p: Int) {
-        }
+        fun staticMethod(p: Int) {}
 
         val staticField = 1
         var staticNonFinalField = 1
diff --git a/j2k/testData/multiFile/ToObject/PureUtils.kt b/j2k/testData/multiFile/ToObject/PureUtils.kt
index 30b26629eeb..5fd5a33d134 100644
--- a/j2k/testData/multiFile/ToObject/PureUtils.kt
+++ b/j2k/testData/multiFile/ToObject/PureUtils.kt
@@ -1,9 +1,7 @@
 package test
 
 internal object PureUtils {
-    fun foo1(p: Int) {
-    }
-
+    fun foo1(p: Int) {}
     fun foo2(): Int {
         return 1
     }
diff --git a/j2k/testData/multiFile/ToObject/Utils.kt b/j2k/testData/multiFile/ToObject/Utils.kt
index f9732f004b8..fe16e4b2fec 100644
--- a/j2k/testData/multiFile/ToObject/Utils.kt
+++ b/j2k/testData/multiFile/ToObject/Utils.kt
@@ -1,9 +1,7 @@
 package test
 
 internal object Utils {
-    fun foo1(p: Int) {
-    }
-
+    fun foo1(p: Int) {}
     fun foo2(): Int {
         return 1
     }
diff --git a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
index f7b706e6f24..45d93fd898d 100644
--- a/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
+++ b/ultimate/testData/spring/core/generate/beanDependenciesByXml/setter.kt.after
@@ -4,8 +4,8 @@
 package a
 
 open class FooBean {
-    fun setBarBean(barBean: BarBean) {
-    }
+    fun setBarBean(barBean: BarBean) {}
+    
 }
 
 open class BarBean
\ No newline at end of file