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

idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.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/extractSuper/superFunctionCall.kt

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

idea/testData/refactoring/extractFunction/parameters/extractSuper/superLabeledFunctionCall.kt

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

idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.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

@@ -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
+}

idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 class MyClass {
     fun test(): Int {
         <selection>coFun()

idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt.after

@@ -1,9 +1,4 @@
-// NEXT_SIBLING:
-fun i(): Int {
-    MyClass.coFun()
-    return MyClass.coProp + 10
-}
-
+// SIBLING:
 class MyClass {
     fun test(): Int {
         return i()
@@ -17,3 +12,8 @@ class MyClass {
         }
     }
 }
+
+fun i(): Int {
+    MyClass.coFun()
+    return MyClass.coProp + 10
+}

idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 class A {
     class B {
         fun test(): Int {

idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt.after

@@ -1,9 +1,4 @@
-// NEXT_SIBLING:
-fun i(): Int {
-    A.B.coFun()
-    return A.B.coProp + 10
-}
-
+// SIBLING:
 class A {
     class B {
         fun test(): Int {
@@ -20,4 +15,9 @@ class A {
     }
 }
 
+fun i(): Int {
+    A.B.coFun()
+    return A.B.coProp + 10
+}
+
 

idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt

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

idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after

@@ -1,8 +1,8 @@
-// NEXT_SIBLING:
-fun i(a: Int, b: Int, c: Int): Int {
-    return (a + b * a - c) + b * c
-}
-
+// SIBLING:
 fun foo(a: Int, b: Int, c: Int): Int {
     return i(a, b, c)
 }
+
+fun i(a: Int, b: Int, c: Int): Int {
+    return (a + b * a - c) + b * c
+}

idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 public class A() {
     fun bar(a: Int, b: Int): Int {
         return a + b

idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after

@@ -1,14 +1,14 @@
-// NEXT_SIBLING:
-fun i(a: A, t: Int, u: Int, x: Int): Int {
-    return a.bar(t - x, u + x)
-}
-
+// SIBLING:
 public class A() {
     fun bar(a: Int, b: Int): Int {
         return a + b
     }
 }
 
+fun i(a: A, t: Int, u: Int, x: Int): Int {
+    return a.bar(t - x, u + x)
+}
+
 fun foo(a: A, x: Int): Int {
     val t = 10
     val u = 20

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt

@@ -3,7 +3,7 @@ trait Callable<T> {
 }
 
 fun foo(a: Int): Int {
-    // NEXT_SIBLING:
+    // SIBLING:
     val o = object: Callable<Int> {
         val b: Int = 1
 

idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClass.kt

@@ -1,4 +1,4 @@
-// NEXT_SIBLING:
+// SIBLING:
 fun foo(a: Int): Int {
     class T(val b: Int)