Introduce "use expression body" inspection #KT-16063 Fixed

Converted from the relevant intention
Reported cases: one-liners, whens
Also, more exact caret detection in local inspection tests

idea/testData/inspectionsLocal/collections/simplifiableCallChain/filterIsEmpty.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf(1, 2, 3).filter <caret>{ it % 2 != 0 }.isEmpty()
+val x = listOf(1, 2, 3).filte<caret>r { it % 2 != 0 }.isEmpty()

idea/testData/inspectionsLocal/collections/simplifiableCallChain/filterIsNotEmpty.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf(1, 2, 3).filter <caret>{ it % 2 != 0 }.isNotEmpty()
+val x = listOf(1, 2, 3).filte<caret>r { it % 2 != 0 }.isNotEmpty()

idea/testData/inspectionsLocal/collections/simplifiableCallChain/filterLastExplicit.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf("1", "").filter <caret>{ element -> element.isNotEmpty() }.last()
+val x = listOf("1", "").filte<caret>r { element -> element.isNotEmpty() }.last()

idea/testData/inspectionsLocal/collections/simplifiableCallChain/filterTextSingleOrNull.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = "5abc".filter { it.isDigit() }.<caret>singleOrNull()
+val x = "5abc".<caret>filter { it.isDigit() }.singleOrNull()

idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinTo.kt

@@ -1,4 +1,4 @@
 // WITH_RUNTIME
 
 val sb = StringBuilder()
-val x = listOf(1, 2, 3).map { "$it*$it" }.<caret>joinTo(buffer = sb, prefix = "= ", separator = " + ")
+val x = listOf(1, 2, 3).<caret>map { "$it*$it" }.joinTo(buffer = sb, prefix = "= ", separator = " + ")

idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToString.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf(1, 2, 3).map { "$it*$it" }.<caret>joinToString(prefix = "= ", separator = " + ")
+val x = listOf(1, 2, 3).<caret>map { "$it*$it" }.joinToString(prefix = "= ", separator = " + ")

idea/testData/inspectionsLocal/collections/simplifiableCallChain/joinToStringWithReference.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf(1, 2, 3).map(Int::toString).<caret>joinToString(prefix = "= ", separator = " + ")
+val x = listOf(1, 2, 3).<caret>map(Int::toString).joinToString(prefix = "= ", separator = " + ")

idea/testData/inspectionsLocal/collections/simplifiableCallChain/mapNotNull.kt

@@ -1,3 +1,3 @@
 // WITH_RUNTIME
 
-val x = listOf(1, 0, 2).map { if (it != 0) it else null }.<caret>filterNotNull()
+val x = listOf(1, 0, 2).<caret>map { if (it != 0) it else null }.filterNotNull()

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/basic.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*arrayOf<caret>("abc"))
+    foo(*<caret>arrayOf("abc"))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/booleanArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Boolean) {}
 
 fun bar() {
-    foo(*booleanArrayOf<caret>(true, true))
+    foo(*<caret>booleanArrayOf(true, true))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/byteArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Byte) {}
 
 fun bar() {
-    foo(*byteArrayOf<caret>(1))
+    foo(*<caret>byteArrayOf(1))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/charArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Char) {}
 
 fun bar() {
-    foo(*charArrayOf<caret>('a', 'b'))
+    foo(*<caret>charArrayOf('a', 'b'))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/doubleArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Double) {}
 
 fun bar() {
-    foo(*doubleArrayOf<caret>(1.0))
+    foo(*<caret>doubleArrayOf(1.0))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/emptyArray.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*emptyArray<caret><String>())
+    foo(*<caret>emptyArray<String>())
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/floatArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Float) {}
 
 fun bar() {
-    foo(*floatArrayOf<caret>(1.0f))
+    foo(<caret>*floatArrayOf(1.0f))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/intArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Int) {}
 
 fun bar() {
-    foo(*intArrayOf<caret>(1))
+    foo(<caret>*intArrayOf(1))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/longArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Long) {}
 
 fun bar() {
-    foo(*longArrayOf<caret>(1L))
+    foo(<caret>*longArrayOf(1L))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/multipleValues.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*arrayOf<caret>("abc", "def"))
+    foo(<caret>*arrayOf("abc", "def"))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/multipleValuesWithOtherValues.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*arrayOf<caret>("abc", "def"), "ghi", "jkl")
+    foo(<caret>*arrayOf("abc", "def"), "ghi", "jkl")
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/namedArgumentForArray.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*arrayOf<caret>(elements = "abc"))
+    foo(<caret>*arrayOf(elements = "abc"))
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/noParams.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: String) {}
 
 fun bar() {
-    foo(*arrayOf<caret>())
+    foo(<caret>*arrayOf())
 }

idea/testData/inspectionsLocal/removeRedundantSpreadOperator/shortArrayOf.kt

@@ -1,5 +1,5 @@
 fun foo(vararg x: Short) {}
 
 fun bar() {
-    foo(*shortArrayOf<caret>(1))
+    foo(<caret>*shortArrayOf(1))
 }

idea/testData/inspectionsLocal/useExpressionBody/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.UseExpressionBodyInspection

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/anonymousObjectExpression.kt

@@ -0,0 +1,11 @@
+interface I {
+    fun foo(): String
+}
+
+fun bar(): I {
+    <caret>return object: I {
+        override fun foo(): String {
+            return "a"
+        }
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/anonymousObjectExpression.kt.after

@@ -0,0 +1,9 @@
+interface I {
+    fun foo(): String
+}
+
+fun bar()<selection>: I</selection> = object: I {
+    override fun foo(): String {
+        return "a"
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/assignPlus.kt

@@ -0,0 +1,7 @@
+// PROBLEM: none
+
+var x = 0
+
+fun <caret>foo() {
+    x += 1
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/assignment.kt

@@ -0,0 +1,8 @@
+// PROBLEM: none
+
+var a = 1
+var b = 2
+
+fun foo() {
+    <caret>a = b
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/constructorWithEmptyBody.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+
+class C {
+    constructor()<caret> {}
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/declaration.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+
+fun foo() {
+    <caret>val v = 1
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisIfElseUnit.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: true
+
+fun nullable() {}
+
+fun bar() {}
+
+fun foo(f: Boolean) {
+    <caret>nullable() ?: if (f) bar() else bar()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisIfElseUnit.kt.after

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: true
+
+fun nullable() {}
+
+fun bar() {}
+
+fun foo(f: Boolean) = nullable() ?: if (f) bar() else bar()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisIfUnit.kt

@@ -0,0 +1,9 @@
+// PROBLEM: none
+
+fun nullable() {}
+
+fun bar() {}
+
+fun foo(f: Boolean) {
+    <caret>nullable() ?: if (f) bar()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/elvisWhenUnitNonExhaustive.kt

@@ -0,0 +1,10 @@
+// PROBLEM: none
+
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) {
+    <caret>println("result") ?: when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/emptyList.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo(): List<String> {
+    ret<caret>urn emptyList()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/emptyList.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+fun foo(): List<String> = emptyList()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/expressionWithReturns1.kt

@@ -0,0 +1,7 @@
+// PROBLEM: none
+
+fun foo(p: Boolean): String {
+    <caret>return bar() ?: return "a"
+}
+
+fun bar(): String? = null

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/expressionWithReturns2.kt

@@ -0,0 +1,10 @@
+// PROBLEM: none
+
+fun foo(p: Boolean): String {
+    if (p) {
+        <caret>return "abc"
+    }
+    else {
+        return "def"
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithEmptyBody.kt

@@ -0,0 +1,2 @@
+fun <caret>foo() {
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithEmptyBody.kt.after

@@ -0,0 +1 @@
+fun foo() = Unit

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithEmptyBody2.kt

@@ -0,0 +1,2 @@
+fun <caret>foo(): Unit {
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithEmptyBody2.kt.after

@@ -0,0 +1 @@
+fun foo(): Unit = Unit

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo() {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+fun foo()<selection>: Unit</selection> = throw UnsupportedOperationException()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithNoBlock.kt

@@ -0,0 +1,3 @@
+// PROBLEM: none
+
+fun foo() = <caret>"abc"

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithNothingType.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo(): Nothing {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithNothingType.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+fun foo()<selection>: Nothing</selection> = throw UnsupportedOperationException()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithReturn.kt

@@ -0,0 +1,3 @@
+fun foo(): String {
+    <caret>return "abc"
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithReturn.kt.after

@@ -0,0 +1 @@
+fun foo()<selection>: String</selection> = "abc"

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithUnitType.kt

@@ -0,0 +1,5 @@
+fun foo() {
+    <caret>bar()
+}
+
+fun bar() { }

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithUnitType.kt.after

@@ -0,0 +1,3 @@
+fun foo() = bar()
+
+fun bar() { }

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithUnitType2.kt

@@ -0,0 +1,7 @@
+// PROBLEM: none
+
+fun foo() {
+    <caret>bar()
+}
+
+fun bar(): String = "abc"

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithUnitTypeWithThrow.kt

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo(): Unit {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/funWithUnitTypeWithThrow.kt.after

@@ -0,0 +1,3 @@
+// WITH_RUNTIME
+
+fun foo()<selection>: Unit</selection> = throw UnsupportedOperationException()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/functionLiteral.kt

@@ -0,0 +1,9 @@
+// PROBLEM: none
+
+fun foo(handler: () -> Unit) { }
+
+fun bar() {
+    foo { <caret>zoo() }
+}
+
+fun zoo(){}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/getWithReturn.kt

@@ -0,0 +1,4 @@
+val foo: String
+    get() {
+        <caret>return "abc"
+    }

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/getWithReturn.kt.after

@@ -0,0 +1,2 @@
+val foo: String
+    get() = "abc"

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifElseUnit.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: true
+
+fun bar() {}
+
+fun foo(f: Boolean) {
+    <caret>if (f) bar() else bar()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifElseUnit.kt.after

@@ -0,0 +1,5 @@
+// IS_APPLICABLE: true
+
+fun bar() {}
+
+fun foo(f: Boolean) = if (f) bar() else bar()

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifUnit.kt

@@ -0,0 +1,7 @@
+// PROBLEM: none
+
+fun bar() {}
+
+fun foo(f: Boolean) {
+    <caret>if (f) bar()
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitExhaustive.kt

@@ -0,0 +1,19 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) {
+    <caret>if (mode) {
+        when (access) {
+            AccessMode.READ -> println("read")
+            AccessMode.WRITE -> println("write")
+            AccessMode.RW -> println("both")
+        }
+    }
+    else {
+        when (access) {
+            AccessMode.READ -> println("noread")
+            AccessMode.WRITE -> println("nowrite")
+            AccessMode.RW -> println("no both")
+        }
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitExhaustive.kt.after

@@ -0,0 +1,17 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) = if (mode) {
+    when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+        AccessMode.RW -> println("both")
+    }
+}
+else {
+    when (access) {
+        AccessMode.READ -> println("noread")
+        AccessMode.WRITE -> println("nowrite")
+        AccessMode.RW -> println("no both")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/ifWhenUnitNonExhaustive.kt

@@ -0,0 +1,19 @@
+// PROBLEM: none
+
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) {
+    <caret>if (mode) {
+        when (access) {
+            AccessMode.READ -> println("read")
+            AccessMode.WRITE -> println("write")
+        }
+    }
+    else {
+        when (access) {
+            AccessMode.READ -> println("noread")
+            AccessMode.WRITE -> println("nowrite")
+            AccessMode.RW -> println("no both")
+        }
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/1.kt

@@ -0,0 +1,3 @@
+fun getText(): String {
+    <caret>return "xxx" //TODO
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/1.kt.after

@@ -0,0 +1 @@
+fun getText(): String = "xxx" //TODO

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/2.kt

@@ -0,0 +1,4 @@
+fun getText(): String {
+    // let's return xxx
+    <caret>return "xxx" //TODO
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/2.kt.after

@@ -0,0 +1,2 @@
+fun getText(): String = // let's return xxx
+        "xxx" //TODO

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/3.kt

@@ -0,0 +1,3 @@
+fun getText(): String { // let's return xxx
+    <caret>return "xxx"
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/3.kt.after

@@ -0,0 +1,2 @@
+fun getText(): String = // let's return xxx
+        "xxx"

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/4.kt

@@ -0,0 +1,4 @@
+fun getText(): String {
+    /* let's return xxx */
+    <caret>return "xxx" /* TODO */
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/keepComments/4.kt.after

@@ -0,0 +1,2 @@
+fun getText(): String = /* let's return xxx */
+        "xxx" /* TODO */

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaIfUnit.kt

@@ -0,0 +1,12 @@
+// IS_APPLICABLE: true
+
+fun <T> run(f: () -> T) = f()
+fun whenExpr(flag: Boolean) {
+    <caret>run {
+        println("run")
+        if (flag) {
+            println("flag")
+        }
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaIfUnit.kt.after

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: true
+
+fun <T> run(f: () -> T) = f()
+fun whenExpr(flag: Boolean) = run {
+    println("run")
+    if (flag) {
+        println("flag")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt

@@ -0,0 +1,13 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun <T> run(f: () -> T) = f()
+fun whenExpr(access: AccessMode) {
+    <caret>run {
+        println("run")
+        when (access) {
+            AccessMode.READ -> println("read")
+            AccessMode.WRITE -> println("write")
+        }
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/lambdaWhenUnitNonExhaustive.kt.after

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun <T> run(f: () -> T) = f()
+fun whenExpr(access: AccessMode) = run {
+    println("run")
+    when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/multipleStatements.kt

@@ -0,0 +1,6 @@
+// PROBLEM: none
+
+fun foo(): String {
+    val v = 1
+    <caret>return "abc"
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/overridePublicFun.kt

@@ -0,0 +1,9 @@
+open class A {
+    public open fun foo(): String = ""
+}
+
+class B : A() {
+    public override fun foo(): String {
+        <caret>return "abc"
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/overridePublicFun.kt.after

@@ -0,0 +1,7 @@
+open class A {
+    public open fun foo(): String = ""
+}
+
+class B : A() {
+    public override fun foo()<selection>: String</selection> = "abc"
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/returnFromLambda.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+public fun List<String>.fn() : List<String> {
+    <caret>return map {
+        if (it.isEmpty()) return@map "<empty>"
+        it
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/returnFromLambda.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+
+public fun List<String>.fn() <selection>: List<String></selection><caret> = map {
+    if (it.isEmpty()) return@map "<empty>"
+    it
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/returnFromLambda2.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+public fun List<String>.fn() : List<String> {
+    <caret>return map {
+        if (it.isEmpty()) return emptyList()
+        it
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/returnFromLambda2.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+
+public fun List<String>.fn() : List<String> = map {
+    if (it.isEmpty()) return emptyList()
+    it
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/returnWithNoValue.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+
+fun foo() {
+    <caret>return
+}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenIfUnitExhaustive.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> if (mode) println("read") else println("noread")
+        AccessMode.WRITE -> if (mode) println("write") else println("nowrite")
+        AccessMode.RW -> if (mode) println("both") else println("no both")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenIfUnitExhaustive.kt.after

@@ -0,0 +1,8 @@
+// IS_APPLICABLE: true
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) = when (access) {
+    AccessMode.READ -> if (mode) println("read") else println("noread")
+    AccessMode.WRITE -> if (mode) println("write") else println("nowrite")
+    AccessMode.RW -> if (mode) println("both") else println("no both")
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenIfUnitNonExhaustive.kt

@@ -0,0 +1,11 @@
+// PROBLEM: none
+
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> if (mode) println("read") else println("noread")
+        AccessMode.WRITE -> if (mode) println("write")
+        AccessMode.RW -> if (mode) println("both") else println("no both")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitExhaustive.kt

@@ -0,0 +1,9 @@
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+        AccessMode.RW -> println("rw")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitExhaustive.kt.after

@@ -0,0 +1,7 @@
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) = when (access) {
+    AccessMode.READ -> println("read")
+    AccessMode.WRITE -> println("write")
+    AccessMode.RW -> println("rw")
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitNonExhaustive.kt

@@ -0,0 +1,10 @@
+// PROBLEM: none
+
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitWithElse.kt

@@ -0,0 +1,9 @@
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> println("read")
+        AccessMode.WRITE -> println("write")
+        else -> println("else")
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenUnitWithElse.kt.after

@@ -0,0 +1,7 @@
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(access: AccessMode) = when (access) {
+    AccessMode.READ -> println("read")
+    AccessMode.WRITE -> println("write")
+    else -> println("else")
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/whenWhenNonExhaustive.kt

@@ -0,0 +1,19 @@
+// PROBLEM: none
+
+enum class AccessMode { READ, WRITE, RW }
+fun whenExpr(mode: Boolean, access: AccessMode) {
+    <caret>when (access) {
+        AccessMode.READ -> when (mode) {
+            true -> println("read")
+            false -> println("noread")
+        }
+        AccessMode.WRITE -> when (mode) {
+            true -> println("write")
+        }
+        AccessMode.RW -> when (mode) {
+            true -> println("both")
+            else -> println("no both")
+        }
+    }
+}
+fun println(s: String) {}

idea/testData/inspectionsLocal/useExpressionBody/convertToExpressionBody/while.kt

@@ -0,0 +1,5 @@
+// PROBLEM: none
+
+fun foo(p: Boolean): String {
+    <caret>while(true) { }
+}

idea/testData/inspectionsLocal/useExpressionBody/if.kt

@@ -0,0 +1,11 @@
+// HIGHLIGHT: INFORMATION
+
+fun abs(x: Int): Int {
+    // No highlighting here
+    <caret>return if (x > 0) {
+        x
+    }
+    else {
+        -x
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/if.kt.after

@@ -0,0 +1,9 @@
+// HIGHLIGHT: INFORMATION
+
+fun abs(x: Int): Int = // No highlighting here
+        if (x > 0) {
+            x
+        }
+        else {
+            -x
+        }

idea/testData/inspectionsLocal/useExpressionBody/multiLine.kt

@@ -0,0 +1,6 @@
+// HIGHLIGHT: INFORMATION
+
+fun Int?.orZero(): Int {
+    retur<caret>n this
+           ?: 0
+}

idea/testData/inspectionsLocal/useExpressionBody/multiLine.kt.after

@@ -0,0 +1,4 @@
+// HIGHLIGHT: INFORMATION
+
+fun Int?.orZero(): Int = this
+       ?: 0

idea/testData/inspectionsLocal/useExpressionBody/oneLine.kt

@@ -0,0 +1,3 @@
+fun sqr(x: Int): Int {
+    <caret>return x * x
+}

idea/testData/inspectionsLocal/useExpressionBody/oneLine.kt.after

@@ -0,0 +1 @@
+fun sqr(x: Int): Int = x * x

idea/testData/inspectionsLocal/useExpressionBody/when.kt

@@ -0,0 +1,7 @@
+fun sign(x: Int): Int {
+    <caret>return when {
+        x < 0 -> -1
+        x > 0 -> 1
+        else -> 0
+    }
+}

idea/testData/inspectionsLocal/useExpressionBody/when.kt.after

@@ -0,0 +1,5 @@
+fun sign(x: Int): Int = when {
+    x < 0 -> -1
+    x > 0 -> 1
+    else -> 0
+}