Merge pull request #2033 from t-kameyama/KT-28699

KT-28699 Add "Convert to also" intention

idea/testData/intentions/convertToAlso/.intention

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

idea/testData/intentions/convertToAlso/itParameter.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(it: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2(it)<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToAlso/itParameter2.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(it: MyClass) {
+        val a = MyClass()
+        a.foo1()
+        a.foo2(it)
+        a.foo3()<caret>
+    }
+}

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            it.foo1().foo2().foo3()
+            it.foo2()
+            it.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToAlso/methodChainWithItParameter.kt

@@ -0,0 +1,17 @@
+// WITH_RUNTIME
+// IS_APPLICABLE: false
+
+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/convertToAlso/methodChainWithThisParameter.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() {
+        val a = MyClass()
+        a.foo1(this).foo2().foo3()
+        a.foo2()<caret>
+        a.foo3()
+    }
+}

idea/testData/intentions/convertToAlso/methodChainWithThisParameter.kt.after

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

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            it.foo1()
+            it.foo2()
+            it.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            it.foo1()
+            it.foo2()
+            it.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            it.foo1()
+            it.foo2()
+            it.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToAlso/untilItParameter.kt

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

idea/testData/intentions/convertToAlso/untilItParameter.kt.after

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

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            it.foo1()
+            it.foo2()
+            it.foo3()
+        }
+    }
+}

idea/testData/intentions/convertToAlso/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/convertToAlso/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().also {
+            // here is comment
+            it.foo1()
+            // comment
+
+            // bbb
+            it.foo2()
+            it.foo3()
+        }
+        // last comment won't be in
+    }
+}

idea/testData/intentions/convertToApply/methodChainWithItParameter.kt

@@ -1,5 +1,4 @@
 // WITH_RUNTIME
-// IS_APPLICABLE: false
 
 class MyClass {
     fun foo1(a: MyClass): MyClass = this

idea/testData/intentions/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/convertToRun/itReceiver.kt

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

idea/testData/intentions/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/convertToRun/methodChainWithItParameter.kt

@@ -1,5 +1,4 @@
 // WITH_RUNTIME
-// IS_APPLICABLE: false
 
 class MyClass {
     fun foo1(a: MyClass): MyClass = this

idea/testData/intentions/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/convertToWith/itReceiver.kt

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

idea/testData/intentions/convertToWith/itReceiver.kt.after

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

idea/testData/intentions/convertToWith/methodChainWithItParameter.kt

@@ -1,5 +1,4 @@
 // WITH_RUNTIME
-// IS_APPLICABLE: false
 
 class MyClass {
     fun foo1(a: MyClass): MyClass = this

idea/testData/intentions/convertToWith/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 {
+            with(a) {
+                foo1(it).foo2().foo3()
+                foo2()
+            }
+        }
+    }
+}