Insert empty lines after functions and properties (KT-4002)

#KT-4002 Fixed

idea/testData/formatter/EmptyLineBetweeAbstractFunctions.after.kt

@@ -0,0 +1,9 @@
+trait Some {
+    fun f1()
+    fun f2()
+}
+
+abstract class Abstract() {
+    abstract fun f1()
+    abstract fun f2()
+}

idea/testData/formatter/EmptyLineBetweeAbstractFunctions.kt

@@ -0,0 +1,9 @@
+trait Some {
+    fun f1()
+    fun f2()
+}
+
+abstract class Abstract() {
+    abstract fun f1()
+    abstract fun f2()
+}

idea/testData/formatter/EmptyLineBetweenClassAndFunction.after.kt

@@ -0,0 +1,48 @@
+fun f1() {
+}
+
+class C1 {}
+
+// -----
+
+fun f2() {
+}
+
+class C2
+
+// -----
+
+fun f3 = 1
+class C3 {}
+
+// -----
+
+fun f4 = 2
+class C4
+
+// -----
+
+class C5 {}
+
+fun f5() {
+}
+
+// -----
+
+class C6
+
+fun f6() {
+}
+
+// -----
+
+class C7 {}
+
+fun f7 = 1
+
+// -----
+
+class C8
+
+fun f8 = 1
+

idea/testData/formatter/EmptyLineBetweenClassAndFunction.kt

@@ -0,0 +1,38 @@
+fun f1() {}
+class C1 {}
+
+// -----
+
+fun f2() {}
+class C2
+
+// -----
+
+fun f3 = 1
+class C3 {}
+
+// -----
+
+fun f4 = 2
+class C4
+
+// -----
+
+class C5 {}
+fun f5() {}
+
+// -----
+
+class C6
+fun f6() {}
+
+// -----
+
+class C7 {}
+fun f7 = 1
+
+// -----
+
+class C8
+fun f8 = 1
+

idea/testData/formatter/EmptyLineBetweenClasses.after.kt

@@ -0,0 +1,25 @@
+class A
+class B
+class C {
+
+}
+
+class D {
+
+}
+
+class E
+: Some
+
+class F
+
+fun some() = 1
+class G
+
+fun some() = 1
+
+val a = 1
+
+class H
+
+val b = 1

idea/testData/formatter/EmptyLineBetweenClasses.kt

@@ -0,0 +1,19 @@
+class A
+class B
+class C {
+
+}
+class D {
+
+}
+class E
+    : Some
+class F
+
+fun some() = 1
+class G
+fun some() = 1
+
+val a = 1
+class H
+val b = 1

idea/testData/formatter/EmptyLineBetweenFunAndProperty.after.kt

@@ -0,0 +1,76 @@
+// No lines
+fun f1() {
+}
+
+val p1 = 1
+fun f2() {
+}
+
+fun f3() = 1
+val p2 = 1
+fun f4() = 1
+
+fun f4() {
+}
+
+val p3: Int
+    get() = 1
+
+fun f5() = 1
+
+class OneLine {
+    fun f1() {
+    }
+
+    val p1 = 1
+
+    fun f2() {
+    }
+
+    fun f3() = 1
+
+    val p2 = 1
+
+    fun f4() = 1
+
+    fun f4() {
+    }
+
+    val p3: Int
+        get() = 1
+
+    fun f5() = 1
+}
+
+class TwoLines {
+    fun f1() {
+    }
+
+
+    val p1 = 1
+
+
+    fun f2() {
+    }
+
+
+    fun f3() = 1
+
+
+    val p2 = 1
+
+
+    fun f4() = 1
+
+
+    fun f4() {
+    }
+
+
+    val p3: Int
+        get() = 1
+
+
+    fun f5() = 1
+}
+

idea/testData/formatter/EmptyLineBetweenFunAndProperty.kt

@@ -0,0 +1,64 @@
+// No lines
+fun f1() {}
+val p1 = 1
+fun f2() {}
+
+fun f3() = 1
+val p2 = 1
+fun f4() = 1
+
+fun f4() {}
+val p3: Int
+    get() = 1
+fun f5() = 1
+
+class OneLine {
+    fun f1() {}
+
+    val p1 = 1
+
+    fun f2() {}
+
+    fun f3() = 1
+
+    val p2 = 1
+
+    fun f4() = 1
+
+    fun f4() {}
+
+    val p3: Int
+        get() = 1
+
+    fun f5() = 1
+}
+
+class TwoLines {
+    fun f1() {}
+
+
+    val p1 = 1
+
+
+    fun f2() {}
+
+
+    fun f3() = 1
+
+
+    val p2 = 1
+
+
+    fun f4() = 1
+
+
+    fun f4() {}
+
+
+    val p3: Int
+        get() = 1
+
+
+    fun f5() = 1
+}
+

idea/testData/formatter/EmptyLineBetweenFunctions.after.kt

@@ -0,0 +1,66 @@
+// No lines between
+
+fun f2() {
+}
+
+fun f1() {
+}
+
+fun f3() = 1
+fun f4() {
+}
+
+fun f5() {
+}
+
+fun f6() = 1
+fun f7() = 8
+
+// One line
+
+fun f2() {
+}
+
+fun f1() {
+}
+
+fun f3() = 1
+
+fun f4() {
+}
+
+fun f5() {
+}
+
+fun f6() = 1
+
+fun f7() = 8
+
+// Two lines between
+fun l1() {
+}
+
+
+fun l2() {
+}
+
+
+fun l3() = 1
+
+
+fun l4() {
+}
+
+
+fun l5() {
+}
+
+
+fun l6() = 1
+
+
+fun l7() = 8
+
+
+
+

idea/testData/formatter/EmptyLineBetweenFunctions.kt

@@ -0,0 +1,53 @@
+// No lines between
+
+fun f2() {}
+fun f1() {}
+fun f3() = 1
+fun f4() {}
+fun f5() {
+}
+fun f6() = 1
+fun f7() = 8
+
+// One line
+
+fun f2() {}
+
+fun f1() {}
+
+fun f3() = 1
+
+fun f4() {}
+
+fun f5() {
+}
+
+fun f6() = 1
+
+fun f7() = 8
+
+// Two lines between
+fun l1() {}
+
+
+fun l2() {}
+
+
+fun l3() = 1
+
+
+fun l4() {}
+
+
+fun l5() {
+}
+
+
+fun l6() = 1
+
+
+fun l7() = 8
+
+
+
+

idea/testData/formatter/EmptyLineBetweenProperties.after.kt

@@ -0,0 +1,42 @@
+val p1 by Some
+val p2 = 1
+val p3: Int get() = 3
+val p4: Int
+    get() {
+        return 1
+    }
+val p5: Int
+
+class OneLine {
+    val p1 by Some
+
+    val p2 = 1
+
+    val p3: Int get() = 3
+
+    val p4: Int
+        get() {
+            return 1
+        }
+
+    val p5: Int
+}
+
+class TwoLines {
+    val p1 by Some
+
+
+    val p2 = 1
+
+
+    val p3: Int get() = 3
+
+
+    val p4: Int
+        get() {
+            return 1
+        }
+
+
+    val p5: Int
+}

idea/testData/formatter/EmptyLineBetweenProperties.kt

@@ -0,0 +1,36 @@
+val p1 by Some
+val p2 = 1
+val p3: Int get() = 3
+val p4: Int
+    get() { return 1 }
+val p5: Int
+
+class OneLine {
+    val p1 by Some
+
+    val p2 = 1
+
+    val p3: Int get() = 3
+
+    val p4: Int
+        get() { return 1 }
+
+    val p5: Int
+}
+
+class TwoLines {
+    val p1 by Some
+
+
+    val p2 = 1
+
+
+    val p3: Int get() = 3
+
+
+    val p4: Int
+        get() { return 1 }
+
+
+    val p5: Int
+}