Extract Function: In case of top-level and member declarations place extracted function after the original container

idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValues.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
     var c: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithIf.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
     var c: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithWhen.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
     var c: Int = 1

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt.after

@@ -1,15 +1,15 @@
-// NEXT_SIBLING:
-fun i(a: Int, b: Int): Int {
-    var b1 = b
-    b1 += a
-    println(b1)
-    return b1
-}
-
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 
     b = i(a, b)
 
     return b
+}
+
+fun i(a: Int, b: Int): Int {
+    var b1 = b
+    b1 += a
+    println(b1)
+    return b1
 }

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt.after

@@ -1,4 +1,12 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    var b: Int = 1
+
+    b = i(a, b)
+
+    return b
+}
+
 fun i(a: Int, b: Int): Int {
     var b1 = b
     if (a > 0) {
@@ -6,12 +14,4 @@ fun i(a: Int, b: Int): Int {
     }
     println(b1)
     return b1
-}
-
-fun foo(a: Int): Int {
-    var b: Int = 1
-
-    b = i(a, b)
-
-    return b
 }

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt.after

@@ -1,4 +1,12 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    var b: Int = 1
+
+    b = i(a, b)
+
+    return b
+}
+
 fun i(a: Int, b: Int): Int {
     var b1 = b
     if (a > 0) {
@@ -10,12 +18,4 @@ fun i(a: Int, b: Int): Int {
     }
     println(b1)
     return b1
-}
-
-fun foo(a: Int): Int {
-    var b: Int = 1
-
-    b = i(a, b)
-
-    return b
 }

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt.after

@@ -1,4 +1,12 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    var b: Int = 1
+
+    b = i(a, b)
+
+    return b
+}
+
 fun i(a: Int, b: Int): Int {
     var b1 = b
     when {
@@ -11,12 +19,4 @@ fun i(a: Int, b: Int): Int {
     }
     println(b1)
     return b1
-}
-
-fun foo(a: Int): Int {
-    var b: Int = 1
-
-    b = i(a, b)
-
-    return b
 }

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     var b: Int = 1
 

idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt.after

@@ -1,4 +1,12 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    var b: Int = 1
+
+    b = i(a, b)
+
+    return b
+}
+
 fun i(a: Int, b: Int): Int {
     var b1 = b
     when {
@@ -14,12 +22,4 @@ fun i(a: Int, b: Int): Int {
     }
     println(b1)
     return b1
-}
-
-fun foo(a: Int): Int {
-    var b: Int = 1
-
-    b = i(a, b)
-
-    return b
 }