Convert to scope function: refactor

idea/testData/intentions/convertToScope/convertToApply/.intention

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ConvertToApplyIntention

idea/testData/intentions/convertToScope/convertToApply/methodChain.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1(): MyClass = this
+    fun foo2(): MyClass = this
+    fun foo3(): MyClass = this
+
+    fun foo4() {
+        val a = MyClass()
+        a.foo1().foo2().foo3()
+        a.foo2()<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/methodChain.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1(): MyClass = this
+    fun foo2(): MyClass = this
+    fun foo3(): MyClass = this
+
+    fun foo4() {
+        val a = MyClass().apply {
+            foo1().foo2().foo3()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/methodChainWithItParameter.kt

@@ -0,0 +1,16 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1(a: MyClass): MyClass = this
+    fun foo2(): MyClass = this
+    fun foo3(): MyClass = this
+
+    fun foo4() {
+        listOf<MyClass>().forEach {
+            val a = MyClass()
+            a.foo1(it).foo2().foo3()
+            a.foo2()<caret>
+            a.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/methodChainWithItParameter.kt.after

@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1(a: MyClass): MyClass = this
+    fun foo2(): MyClass = this
+    fun foo3(): MyClass = this
+
+    fun foo4() {
+        listOf<MyClass>().forEach {
+            val a = MyClass().apply {
+                foo1(it).foo2().foo3()
+                foo2()
+                foo3()
+            }
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/methodChainWithThisParameter.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+class MyClass {
+    fun foo1(a: MyClass): MyClass = this
+    fun foo2(): MyClass = this
+    fun foo3(): MyClass = this
+
+    fun foo4() {
+        val a = MyClass()
+        a.foo1(this).foo2().foo3()
+        a.foo2()<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        val a = MyClass()
+        a.foo1()<caret>
+        a.foo2()
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        val a = MyClass().apply {
+            foo1()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal2.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2()<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal2.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass().apply {
+            foo1()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal3.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2()
+        a.foo3()<caret>
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/normal3.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass().apply {
+            foo1()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/onProperty.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        <caret>val a = MyClass()
+        a.foo1()
+        a.foo2()
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/onProperty.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        val a = MyClass().apply {
+            foo1()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/thisParameter.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2(a: MyClass) = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2(this)<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/thisParameter2.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2(a: MyClass) = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2(this)
+        a.foo3()<caret>
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/untilThisParameter.kt

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2(a: MyClass) = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo3()<caret>
+        a.foo2(this)
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/untilThisParameter.kt.after

@@ -0,0 +1,16 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2(a: MyClass) = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        val a = MyClass().apply {
+            foo1()
+            foo3()
+        }
+        a.foo2(this)
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/var.kt

@@ -0,0 +1,14 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        var a = MyClass()
+        a.foo1()<caret>
+        a.foo2()
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/var.kt.after

@@ -0,0 +1,15 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4() {
+        var a = MyClass().apply {
+            foo1()
+            foo2()
+            foo3()
+        }
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/withCommentAndSpaces.kt

@@ -0,0 +1,20 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        // top comment
+        val a = MyClass()
+        // here is comment
+        a.foo1()<caret>
+        // comment
+
+        // bbb
+        a.foo2()
+        a.foo3()
+        // last comment won't be in
+    }
+}

idea/testData/intentions/convertToScope/convertToApply/withCommentAndSpaces.kt.after

@@ -0,0 +1,21 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        // top comment
+        val a = MyClass().apply {
+            // here is comment
+            foo1()
+            // comment
+
+            // bbb
+            foo2()
+            foo3()
+        }
+        // last comment won't be in
+    }
+}