Add intention to convert lambda to anonymous function #KT-7710 Fixed

idea/testData/intentions/lambdaToAnonymousFunction/.intention

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

idea/testData/intentions/lambdaToAnonymousFunction/argument.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(<caret>{ "" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/argument.kt.after

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String { return "" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/destructuringParameter.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+fun foo(f: (Pair<Int, Int>) -> String) {}
+
+fun test() {
+    foo <caret>{ (i, j) -> "" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/explicitParameterName.kt

@@ -0,0 +1,5 @@
+fun bar(f: (Int, Int) -> String) {}
+
+fun test() {
+    bar <caret>{ i, j -> "$i$j" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/explicitParameterName.kt.after

@@ -0,0 +1,5 @@
+fun bar(f: (Int, Int) -> String) {}
+
+fun test() {
+    bar(fun(i: Int, j: Int): String { return "$i$j" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/extention1.kt

@@ -0,0 +1,6 @@
+class Foo
+fun bar(f: Foo.() -> Unit) {}
+
+fun main(args: Array<String>) {
+    bar {}<caret>
+}

idea/testData/intentions/lambdaToAnonymousFunction/extention1.kt.after

@@ -0,0 +1,6 @@
+class Foo
+fun bar(f: Foo.() -> Unit) {}
+
+fun main(args: Array<String>) {
+    bar(fun Foo.() {})
+}

idea/testData/intentions/lambdaToAnonymousFunction/extention2.kt

@@ -0,0 +1,6 @@
+class Foo
+fun baz(f: Foo.(i: Int, j: Int) -> Int) {}
+
+fun main(args: Array<String>) {
+    baz { i, j -> i + j }<caret>
+}

idea/testData/intentions/lambdaToAnonymousFunction/extention2.kt.after

@@ -0,0 +1,6 @@
+class Foo
+fun baz(f: Foo.(i: Int, j: Int) -> Int) {}
+
+fun main(args: Array<String>) {
+    baz(fun Foo.(i: Int, j: Int): Int { return i + j })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasComment.kt

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo <caret>{
+        // comment1
+        ""
+        // comment2
+    }
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasComment.kt.after

@@ -0,0 +1,9 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String {
+        // comment1
+        return ""
+        // comment2
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn1.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo {<caret> return@foo "$it" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn1.kt.after

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String { return "$it" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn2.kt

@@ -0,0 +1,10 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo {
+        if (it == 1) {
+            return@foo "1"
+        }
+        "$it"
+    <caret>}
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn2.kt.after

@@ -0,0 +1,10 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String {
+        if (it == 1) {
+            return "1"
+        }
+        return "$it"
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn3.kt

@@ -0,0 +1,13 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo {
+        if (it == 1) {
+            return@foo "1"
+        } else if (it == 2) {
+            return@foo "2"
+        } else {
+            return@foo "$it"
+        }
+    }<caret>
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn3.kt.after

@@ -0,0 +1,13 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String {
+        if (it == 1) {
+            return "1"
+        } else if (it == 2) {
+            return "2"
+        } else {
+            return "$it"
+        }
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn4.kt

@@ -0,0 +1,11 @@
+// WITH_RUNTIME
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo {<caret>
+        listOf(1).map {
+            return@map 2
+        }
+        return@foo "$it"
+    }
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasReturn4.kt.after

@@ -0,0 +1,11 @@
+// WITH_RUNTIME
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String {
+        listOf(1).map {
+            return@map 2
+        }
+        return "$it"
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasSomeStatements.kt

@@ -0,0 +1,8 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo <caret>{
+        val b = it == 1
+        if (b) "1" else "2"
+    }
+}

idea/testData/intentions/lambdaToAnonymousFunction/hasSomeStatements.kt.after

@@ -0,0 +1,8 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String {
+        val b = it == 1
+        return if (b) "1" else "2"
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/implicitParameterName.kt

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo <caret>{ "$it" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/implicitParameterName.kt.after

@@ -0,0 +1,5 @@
+fun foo(f: (Int) -> String) {}
+
+fun test() {
+    foo(fun(it: Int): String { return "$it" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/namedArgument.kt

@@ -0,0 +1,5 @@
+fun baz(name: String, f: (Int) -> String) {}
+
+fun test() {
+    baz(name = "", f = <caret>{ "$it" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/namedArgument.kt.after

@@ -0,0 +1,5 @@
+fun baz(name: String, f: (Int) -> String) {}
+
+fun test() {
+    baz(name = "", f = fun(it: Int): String { return "$it" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/noParameter.kt

@@ -0,0 +1,5 @@
+fun foo(f: () -> String) {}
+
+fun test() {
+    foo <caret>{ "" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/noParameter.kt.after

@@ -0,0 +1,5 @@
+fun foo(f: () -> String) {}
+
+fun test() {
+    foo(fun(): String { return "" })
+}

idea/testData/intentions/lambdaToAnonymousFunction/returnUnit.kt

@@ -0,0 +1,10 @@
+fun unit(f: (Int) -> Unit) {}
+
+fun foo(i: Int) {}
+
+fun test() {
+    unit {
+        foo(it)
+        foo(it)
+    }<caret>
+}

idea/testData/intentions/lambdaToAnonymousFunction/returnUnit.kt.after

@@ -0,0 +1,10 @@
+fun unit(f: (Int) -> Unit) {}
+
+fun foo(i: Int) {}
+
+fun test() {
+    unit(fun(it: Int) {
+        foo(it)
+        foo(it)
+    })
+}

idea/testData/intentions/lambdaToAnonymousFunction/underscoreParameter.kt

@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+fun foo(f: (Int, Int) -> String) {}
+
+fun test() {
+    foo <caret>{ i, _ -> "" }
+}

idea/testData/intentions/lambdaToAnonymousFunction/variable.kt

@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+fun test() {
+    val a: (Int) -> String = <caret>{ "" }
+}