Convert lambda to callable reference intention / inspection #KT-10903 Fixed

(cherry picked from commit b620099)

idea/testData/intentions/convertLambdaToReference/.intention

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

idea/testData/intentions/convertLambdaToReference/constructor.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+class Person(val name: String)
+
+val x = listOf("Jack", "Tom").map <caret>{ Person(it) }

idea/testData/intentions/convertLambdaToReference/constructor.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+class Person(val name: String)
+
+val x = listOf("Jack", "Tom").map(::Person)

idea/testData/intentions/convertLambdaToReference/conversion.kt

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+val x = listOf("123", "4567").map <caret>{ it.toInt() }

idea/testData/intentions/convertLambdaToReference/conversion.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+val x = listOf("123", "4567").map(String::toInt)

idea/testData/intentions/convertLambdaToReference/defaultArgument.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+fun foo(z: Int, y: Int = 0) = y + z
+
+val x = { arg: Int <caret>-> foo(arg) }

idea/testData/intentions/convertLambdaToReference/defaultBeforeLambda.kt

@@ -0,0 +1,8 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+fun List<Int>.transform(x: Int = 0, f: (Int) -> Int) = map { f(it + x) }
+
+fun bar(x: Int) = x * x
+
+val y = listOf(1, 2, 3).transform { <caret>bar(it) }

idea/testData/intentions/convertLambdaToReference/defaultOverridden.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+
+interface Transformer {
+    fun transform(x: Int = 0, f: (Int) -> Int) = f(x)
+}
+
+class TransformerImpl : Transformer
+
+fun bar(x: Int) = x * x
+
+val y = TransformerImpl().transform { <caret>bar(it) }

idea/testData/intentions/convertLambdaToReference/emptyBrackets.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun bar(s: String) = s.length
+
+val x = listOf("Jack", "Tom").map() <caret>{ w -> bar(w) }

idea/testData/intentions/convertLambdaToReference/emptyBrackets.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun bar(s: String) = s.length
+
+val x = listOf("Jack", "Tom").map(::bar)

idea/testData/intentions/convertLambdaToReference/erasedReceiver.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+class Generic<T : Any> {
+    val y = { arg: T <caret>-> arg.hashCode() }
+}

idea/testData/intentions/convertLambdaToReference/extension.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+
+class Owner(val z: Int) {
+    // Possible only in 1.1 with bound references (this::foo)
+    val x = { arg: Int <caret> -> foo(arg) }
+}
+
+fun Owner.foo(y: Int) = y + z
+

idea/testData/intentions/convertLambdaToReference/extensionProperty.kt

@@ -0,0 +1,3 @@
+val Any.name: String get() = toString()
+
+val converted = { x: Any -> <caret>x.name }

idea/testData/intentions/convertLambdaToReference/extensionProperty.kt.after

@@ -0,0 +1,3 @@
+val Any.name: String get() = toString()
+
+val converted = Any::name

idea/testData/intentions/convertLambdaToReference/generic.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+fun <T> id(y: T) = y
+
+val x = { arg: Int <caret>-> id<Int>(arg) }

idea/testData/intentions/convertLambdaToReference/globalProperty.kt

@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+
+val name = "Kotlin"
+val x = { obj: Any -> <caret>name }

idea/testData/intentions/convertLambdaToReference/globalPropertyNoArgs.kt

@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+
+val name = "Kotlin"
+val x = { -> <caret>name }

idea/testData/intentions/convertLambdaToReference/inner.kt

@@ -0,0 +1,5 @@
+class Owner {
+    inner class Inner
+
+    val x = { <caret>o: Owner -> o.Inner() }
+}

idea/testData/intentions/convertLambdaToReference/inner.kt.after

@@ -0,0 +1,5 @@
+class Owner {
+    inner class Inner
+
+    val x = Owner::Inner
+}

idea/testData/intentions/convertLambdaToReference/mapTo.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun bar(s: String) = s.length
+
+val x = listOf("Jack", "Tom").mapTo(hashSetOf<Int>()) <caret>{ w -> bar(w) }

idea/testData/intentions/convertLambdaToReference/mapTo.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun bar(s: String) = s.length
+
+val x = listOf("Jack", "Tom").mapTo(hashSetOf<Int>(), ::bar)

idea/testData/intentions/convertLambdaToReference/member.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+
+class Owner(val z: Int) {
+    fun foo(y: Int) = y + z
+    // Possible only in 1.1 with bound references (this::foo)
+    val x = { arg: Int <caret> -> foo(arg) }
+}

idea/testData/intentions/convertLambdaToReference/memberExtension.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+
+class Their {
+    fun Int.foo() = "x"
+
+    val x = { arg: Int -> <caret>arg.foo() }
+}

idea/testData/intentions/convertLambdaToReference/name.kt

@@ -0,0 +1,3 @@
+class Person(val name: String)
+
+val reader = { p: Person -> p.name<caret> }

idea/testData/intentions/convertLambdaToReference/name.kt.after

@@ -0,0 +1,3 @@
+class Person(val name: String)
+
+val reader = Person::name

idea/testData/intentions/convertLambdaToReference/nullable.kt

@@ -0,0 +1,3 @@
+fun Int?.foo() = this?.hashCode() ?: 0
+
+val x = { arg: Int? -> arg.foo() <caret>}

idea/testData/intentions/convertLambdaToReference/nullable.kt.after

@@ -0,0 +1,3 @@
+fun Int?.foo() = this?.hashCode() ?: 0
+
+val x = Int?::foo

idea/testData/intentions/convertLambdaToReference/object.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+
+object Object {
+    fun foo() = 42
+}
+
+val x = { o: Object -> o.foo()<caret> }

idea/testData/intentions/convertLambdaToReference/receiverParameter.kt

@@ -0,0 +1,3 @@
+fun Int.foo(x: Int) = this - x
+
+val x = { a: Int, b: Int <caret>-> a.foo(b) }

idea/testData/intentions/convertLambdaToReference/receiverParameter.kt.after

@@ -0,0 +1,3 @@
+fun Int.foo(x: Int) = this - x
+
+val x = Int::foo

idea/testData/intentions/convertLambdaToReference/receiverParameterReversed.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+fun Int.foo(x: Int) = this - x
+
+val x = { a: Int, b: Int <caret>-> b.foo(a) }

idea/testData/intentions/convertLambdaToReference/simple.kt

@@ -0,0 +1,3 @@
+fun foo(y: Int) = y
+
+val x = { arg: Int <caret>-> foo(arg) }

idea/testData/intentions/convertLambdaToReference/simple.kt.after

@@ -0,0 +1,3 @@
+fun foo(y: Int) = y
+
+val x = ::foo

idea/testData/intentions/convertLambdaToReference/syntheticProperty.kt

@@ -0,0 +1,4 @@
+// IS_APPLICABLE: false
+// WITH_RUNTIME
+
+val x = listOf(java.lang.String("")).map { <caret>it.bytes }

idea/testData/intentions/convertLambdaToReference/threeParameters.kt

@@ -0,0 +1,3 @@
+fun foo(x: Int, y: Int, z: Int) = x - y / z
+
+val x = { a: Int, b: Int, c: Int <caret>-> foo(a, b, c) }

idea/testData/intentions/convertLambdaToReference/threeParameters.kt.after

@@ -0,0 +1,3 @@
+fun foo(x: Int, y: Int, z: Int) = x - y / z
+
+val x = ::foo

idea/testData/intentions/convertLambdaToReference/toString.kt

@@ -0,0 +1 @@
+val x = { arg: Int -> <caret>arg.toString() }

idea/testData/intentions/convertLambdaToReference/toString.kt.after

@@ -0,0 +1 @@
+val x = Int::toString

idea/testData/intentions/convertLambdaToReference/unit.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+
+fun Int.exec(f: (Int) -> Unit) = f(this)
+
+fun bar(x: Int) = x
+
+fun foo() {
+    2.exec {<caret> bar(it) }
+}

idea/testData/intentions/convertLambdaToReference/unwrap.kt

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+class Wrapper<T>(private val x: T) {
+    fun unwrap() = x
+}
+
+val unwrapped = listOf(Wrapper(1), Wrapper("B")).map { <caret>it.unwrap() }

idea/testData/intentions/convertLambdaToReference/unwrap.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+
+class Wrapper<T>(private val x: T) {
+    fun unwrap() = x
+}
+
+val unwrapped = listOf(Wrapper(1), Wrapper("B")).map(Wrapper<out Any>::unwrap)

idea/testData/intentions/convertLambdaToReference/wrongParameterNumber.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+fun foo() = 42
+
+val x = { arg: Int <caret>-> foo() }

idea/testData/intentions/convertLambdaToReference/wrongParameterOrder.kt

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: false
+
+fun foo(y: Int, z: Int) = y - z
+
+val x = { second: Int, first: Int -> foo(first, second) }