Convert to scope function: refactor

idea/testData/intentions/convertToScope/convertToRun/.intention

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

idea/testData/intentions/convertToScope/convertToRun/itReceiver.kt

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

idea/testData/intentions/convertToScope/convertToRun/itReceiver.kt.after

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

idea/testData/intentions/convertToScope/convertToRun/javaMethod.1.java

@@ -0,0 +1,4 @@
+public class JavaClass {
+    void bar1() {}
+    void bar2() {}
+}

idea/testData/intentions/convertToScope/convertToRun/javaMethod.1.java.after

@@ -0,0 +1,4 @@
+public class JavaClass {
+    void bar1() {}
+    void bar2() {}
+}

idea/testData/intentions/convertToScope/convertToRun/javaMethod.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+fun test(c: JavaClass) {
+    <caret>c.bar1()
+    c.bar2()
+}

idea/testData/intentions/convertToScope/convertToRun/javaMethod.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun test(c: JavaClass) {
+    c.run {
+        bar1()
+        bar2()
+    }
+}

idea/testData/intentions/convertToScope/convertToRun/javaStaticMethod.1.java

@@ -0,0 +1,4 @@
+public class JavaClass {
+    public static void foo1() {}
+    public static void foo2() {}
+}

idea/testData/intentions/convertToScope/convertToRun/javaStaticMethod.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+fun test() {
+    <caret>JavaClass.foo1()
+    JavaClass.foo2()
+}

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

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

idea/testData/intentions/convertToScope/convertToRun/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(a: MyClass) {
+        a.run {
+            foo1().foo2().foo3()
+            foo2()
+            foo3()
+        }
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

idea/testData/intentions/convertToScope/convertToRun/normal4.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/convertToRun/normal4.kt.after

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

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

@@ -0,0 +1,14 @@
+// IS_APPLICABLE: false
+
+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/convertToRun/thisParameter.kt

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

idea/testData/intentions/convertToScope/convertToRun/thisReceiver.kt

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

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

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

idea/testData/intentions/convertToScope/convertToRun/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) {
+        a.run {
+            foo1()
+            foo3()
+        }
+        a.foo2(this)
+        a.foo3()
+    }
+}

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

@@ -0,0 +1,18 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        // top comment
+        a.foo1()<caret>
+        // comment
+
+        // bbb
+        a.foo2()
+        a.foo3()
+        // last comment
+    }
+}

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

@@ -0,0 +1,20 @@
+// WITH_RUNTIME
+
+class MyClass {
+    fun foo1() = Unit
+    fun foo2() = Unit
+    fun foo3() = Unit
+
+    fun foo4(a: MyClass) {
+        // top comment
+        a.run {
+            foo1()
+            // comment
+
+            // bbb
+            foo2()
+            foo3()
+        }
+        // last comment
+    }
+}