Extract Function: Add test data

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

@@ -0,0 +1,12 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    fun foo(): Int {
+        <selection>return a + super<Z>@A.z</selection>
+    }
+}

idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.kt.conflicts

@@ -0,0 +1 @@
+Cannot extract super-call

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

@@ -0,0 +1,15 @@
+public open class Z {
+    fun zzz() {
+
+    }
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    fun foo(): Int {
+        <selection>super.zzz()
+        return a + 1</selection>
+    }
+}

idea/testData/refactoring/extractFunction/parameters/extractSuper/superFunctionCall.kt.conflicts

@@ -0,0 +1 @@
+Cannot extract super-call

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

@@ -0,0 +1,15 @@
+public open class Z {
+    fun zzz() {
+
+    }
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    fun foo(): Int {
+        <selection>super@A.zzz()
+        return a + 1</selection>
+    }
+}

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

@@ -0,0 +1 @@
+Cannot extract super-call

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

@@ -0,0 +1,12 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    fun foo(): Int {
+        <selection>return a + super.z</selection>
+    }
+}

idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.kt.conflicts

@@ -0,0 +1 @@
+Cannot extract super-call

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

@@ -0,0 +1,16 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return <selection>this@A.a + this@B.b + this@A.z + this@B.z</selection>
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+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
+}
+
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return i(this@A, this@B)
+        }
+    }
+}

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

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

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

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

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

@@ -0,0 +1,16 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return <selection>a + this.b + this.z</selection>
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+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
+}
+
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return i(this@A, this)
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return <selection>a + b + this@A.z + this@B.z</selection>
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+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
+}
+
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return i(this@A, this@B)
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+public open class Z {
+    val z: Int = 0
+}
+
+// NEXT_SIBLING:
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return <selection>a + b + z</selection>
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+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
+}
+
+public class A(): Z() {
+    var a: Int = 1
+
+    public inner class B(): Z() {
+        var b: Int = 1
+
+        fun foo(): Int {
+            return i(this@A, this@B)
+        }
+    }
+}

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

@@ -0,0 +1,15 @@
+// NEXT_SIBLING:
+class MyClass {
+    fun test(): Int {
+        <selection>coFun()
+        return coProp + 10</selection>
+    }
+
+    class object {
+        val coProp = 1
+
+        fun coFun() {
+
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+// NEXT_SIBLING:
+fun i(): Int {
+    MyClass.coFun()
+    return MyClass.coProp + 10
+}
+
+class MyClass {
+    fun test(): Int {
+        return i()
+    }
+
+    class object {
+        val coProp = 1
+
+        fun coFun() {
+
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+// NEXT_SIBLING:
+class A {
+    class B {
+        fun test(): Int {
+            <selection>coFun()
+            return coProp + 10</selection>
+        }
+
+        class object {
+            val coProp = 1
+
+            fun coFun() {
+
+            }
+        }
+    }
+}
+
+

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

@@ -0,0 +1,23 @@
+// NEXT_SIBLING:
+fun i(): Int {
+    A.B.coFun()
+    return A.B.coProp + 10
+}
+
+class A {
+    class B {
+        fun test(): Int {
+            return i()
+        }
+
+        class object {
+            val coProp = 1
+
+            fun coFun() {
+
+            }
+        }
+    }
+}
+
+

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

@@ -0,0 +1,4 @@
+// NEXT_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

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

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

@@ -0,0 +1,12 @@
+// NEXT_SIBLING:
+public class A() {
+    fun bar(a: Int, b: Int): Int {
+        return a + b
+    }
+}
+
+fun foo(a: A, x: Int): Int {
+    val t = 10
+    val u = 20
+    return <selection>a.bar(t - x, u + x)</selection>
+}

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

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

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

@@ -0,0 +1,15 @@
+trait Callable<T> {
+    fun call(): T
+}
+
+fun foo(a: Int): Int {
+    // NEXT_SIBLING:
+    val o = object: Callable<Int> {
+        val b: Int = 1
+
+        override fun call(): Int {
+            return <selection>a + b</selection>
+        }
+    }
+    return o.call()
+}

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

@@ -0,0 +1 @@
+Cannot extract method since following types are not denotable in the target scope: foo.<no name provided>

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

@@ -0,0 +1,7 @@
+// NEXT_SIBLING:
+fun foo(a: Int): Int {
+    class T(val b: Int)
+
+    val t = T(1)
+    return <selection>a + t.b</selection>
+}

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

@@ -0,0 +1 @@
+Cannot extract method since following types are not denotable in the target scope: foo.T