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

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt

@@ -2,7 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after

@@ -2,11 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
-fun i(a1: A, b1: A.B): Int {
-    return a1.a + b1.b + a1.z + b1.z
-}
-
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 
@@ -18,3 +14,7 @@ public class A(): Z() {
         }
     }
 }
+
+fun i(a1: A, b1: A.B): Int {
+    return a1.a + b1.b + a1.z + b1.z
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt

@@ -1,6 +1,6 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
+// SIBLING:
 fun Z.foo(): Int {
     return <selection>this.a</selection> + 1
 }

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after

@@ -1,10 +1,10 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
-fun Z.i(): Int {
-    return a
-}
-
+// SIBLING:
 fun Z.foo(): Int {
     return i() + 1
 }
+
+fun Z.i(): Int {
+    return a
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt

@@ -2,7 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 

idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after

@@ -2,11 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
-fun i(a1: A, b1: A.B): Int {
-    return a1.a + b1.b + b1.z
-}
-
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 
@@ -18,3 +14,7 @@ public class A(): Z() {
         }
     }
 }
+
+fun i(a1: A, b1: A.B): Int {
+    return a1.a + b1.b + b1.z
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt

@@ -2,7 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after

@@ -2,11 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
-fun i(a1: A, b1: A.B): Int {
-    return a1.a + b1.b + a1.z + b1.z
-}
-
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 
@@ -18,3 +14,7 @@ public class A(): Z() {
         }
     }
 }
+
+fun i(a1: A, b1: A.B): Int {
+    return a1.a + b1.b + a1.z + b1.z
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt

@@ -1,6 +1,6 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
+// SIBLING:
 fun Z.foo(): Int {
     return <selection>this.a + a</selection> + 1
 }

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after

@@ -1,10 +1,10 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
-fun Z.i(): Int {
-    return a + a
-}
-
+// SIBLING:
 fun Z.foo(): Int {
     return i() + 1
 }
+
+fun Z.i(): Int {
+    return a + a
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt

@@ -1,6 +1,6 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
+// SIBLING:
 fun Z.foo(): Int {
     return <selection>a</selection> + 1
 }

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after

@@ -1,10 +1,10 @@
 class Z(val a: Int)
 
-// NEXT_SIBLING:
-fun Z.i(): Int {
-    return a
-}
-
+// SIBLING:
 fun Z.foo(): Int {
     return i() + 1
 }
+
+fun Z.i(): Int {
+    return a
+}

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt

@@ -2,7 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 

idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after

@@ -2,11 +2,7 @@ public open class Z {
     val z: Int = 0
 }
 
-// NEXT_SIBLING:
-fun i(a1: A, b1: A.B): Int {
-    return a1.a + b1.b + b1.z
-}
-
+// SIBLING:
 public class A(): Z() {
     var a: Int = 1
 
@@ -18,3 +14,7 @@ public class A(): Z() {
         }
     }
 }
+
+fun i(a1: A, b1: A.B): Int {
+    return a1.a + b1.b + b1.z
+}