Do not force new line in body for empty functions and function expressions (KT-10828)

#KT-10828 Fixed

j2k/testData/fileOrElement/function/emptyVoidMethod.kt

@@ -1,2 +1 @@
-fun main() {
-}
+fun main() {}

j2k/testData/fileOrElement/function/functionInFinalClass.kt

@@ -1,6 +1,5 @@
 package demo
 
 internal class Final {
-    fun test() {
-    }
+    fun test() {}
 }

j2k/testData/fileOrElement/function/internal.kt

@@ -1,2 +1 @@
-fun test() {
-}
+fun test() {}

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" }

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()

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
     ) {
     }
-}
+}

j2k/testData/fileOrElement/function/main.kt

@@ -1,2 +1 @@
-@JvmStatic fun main(args: Array<String>) {
-}
+@JvmStatic fun main(args: Array<String>) {}

j2k/testData/fileOrElement/function/main2.kt

@@ -1,4 +1,3 @@
 object A {
-    @JvmStatic fun main(args: Array<String>) {
-    }
+    @JvmStatic fun main(args: Array<String>) {}
 }

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>) {}
 }

j2k/testData/fileOrElement/function/methodClassType.kt

@@ -1,2 +1 @@
-fun main(): String {
-}
+fun main(): String {}

j2k/testData/fileOrElement/function/methodPrimitiveType.kt

@@ -1,2 +1 @@
-fun main(): Int {
-}
+fun main(): Int {}

j2k/testData/fileOrElement/function/methodPrimitiveType2.kt

@@ -1,2 +1 @@
-fun main(): Boolean {
-}
+fun main(): Boolean {}

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() {}
 }

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() {}
 }

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() {

j2k/testData/fileOrElement/function/ownGenericParam.kt

@@ -1,2 +1 @@
-fun <U> putU(u: U) {
-}
+fun <U> putU(u: U) {}

j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt

@@ -1,2 +1 @@
-fun <U, V, W> putUVW(u: U, v: V, w: W) {
-}
+fun <U, V, W> putUVW(u: U, v: V, w: W) {}

j2k/testData/fileOrElement/function/private.kt

@@ -1,2 +1 @@
-private fun test() {
-}
+private fun test() {}

j2k/testData/fileOrElement/function/protected.kt

@@ -1,2 +1 @@
-protected fun test() {
-}
+protected fun test() {}

j2k/testData/fileOrElement/function/public.kt

@@ -1,2 +1 @@
-fun test() {
-}
+fun test() {}

j2k/testData/fileOrElement/function/synchronizedMethod.kt

@@ -3,6 +3,5 @@ internal class A {
         bar()
     }
 
-    fun bar() {
-    }
+    fun bar() {}
 }