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

idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     <selection>// test
     println(a)

idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt.after

@@ -1,12 +1,12 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    if (b(a)) return a
+    return -a
+}
+
 fun b(a: Int): Boolean {
     // test
     println(a)
     if (a > 0) return true
     return false
-}
-
-fun foo(a: Int): Int {
-    if (b(a)) return a
-    return -a
 }

idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     <selection>/*
     test

idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt.after

@@ -1,4 +1,9 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    if (b(a)) return a
+    return -a
+}
+
 fun b(a: Int): Boolean {
     /*
         test
@@ -6,9 +11,4 @@ fun b(a: Int): Boolean {
     println(a)
     if (a > 0) return true
     return false
-}
-
-fun foo(a: Int): Int {
-    if (b(a)) return a
-    return -a
 }

idea/testData/refactoring/extractFunction/basic/localClassFunctionRef.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     class A {
         fun bar(): Int = a + 10

idea/testData/refactoring/extractFunction/basic/localClassPropertyRef.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     class A {
         val bar: Int = a + 10

idea/testData/refactoring/extractFunction/basic/localExtraction.kt

@@ -0,0 +1,4 @@
+fun foo(a: Int): Int {
+    // SIBLING:
+    return <selection>a + 10</selection>
+}

idea/testData/refactoring/extractFunction/basic/localExtraction.kt.after

@@ -0,0 +1,8 @@
+fun foo(a: Int): Int {
+    // SIBLING:
+    fun i(): Int {
+        return a + 10
+    }
+
+    return i()
+}

idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt

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

idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt

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

idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt

@@ -1,6 +1,6 @@
 fun foo() {
     val a = 1
-    // NEXT_SIBLING
+    // SIBLING:
     if (<selection>a > 0</selection>) {
         fun b(): Int { return 0 }
         println(b())

idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt.after

@@ -1,6 +1,6 @@
 fun foo() {
     val a = 1
-    // NEXT_SIBLING
+    // SIBLING:
     fun b1(): Boolean {
         return a > 0
     }

idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 class A {
     private val t: Int = 1
 

idea/testData/refactoring/extractFunction/basic/refInReturn.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     <selection>println(a)
     if (a > 0) return a</selection>

idea/testData/refactoring/extractFunction/basic/refInReturn.kt.after

@@ -1,11 +1,11 @@
-// NEXT_SIBLING:
+// SIBLING:
+fun foo(a: Int): Int {
+    if (b(a)) return a
+    return -a
+}
+
 fun b(a: Int): Boolean {
     println(a)
     if (a > 0) return true
     return false
-}
-
-fun foo(a: Int): Int {
-    if (b(a)) return a
-    return -a
 }