Intention "Convert to expression body"

idea/testData/intentions/convertToExpressionBody/afterAnonymousObjectExpression.kt

@@ -0,0 +1,10 @@
+// "Convert to expression body" "true"
+trait I {
+    fun foo(): String
+}
+
+fun bar(): I = object: I {
+    override fun foo(): String {
+        return "a"
+    }
+}

idea/testData/intentions/convertToExpressionBody/afterFunWithImplicitUnitTypeWithThrow.kt

@@ -0,0 +1,2 @@
+// "Convert to expression body" "true"
+fun foo(): Unit = throw UnsupportedOperationException()

idea/testData/intentions/convertToExpressionBody/afterFunWithNothingType.kt

@@ -0,0 +1,2 @@
+// "Convert to expression body" "true"
+fun foo(): Nothing = throw UnsupportedOperationException()

idea/testData/intentions/convertToExpressionBody/afterFunWithReturn.kt

@@ -0,0 +1,2 @@
+// "Convert to expression body" "true"
+fun foo(): String = "abc"

idea/testData/intentions/convertToExpressionBody/afterFunWithUnitType.kt

@@ -0,0 +1,4 @@
+// "Convert to expression body" "true"
+fun foo() = bar()
+
+fun bar() { }

idea/testData/intentions/convertToExpressionBody/afterFunWithUnitTypeWithThrow.kt

@@ -0,0 +1,2 @@
+// "Convert to expression body" "true"
+fun foo(): Unit = throw UnsupportedOperationException()

idea/testData/intentions/convertToExpressionBody/afterGetWithReturn.kt

@@ -0,0 +1,3 @@
+// "Convert to expression body" "true"
+val foo: String
+    get() = "abc"

idea/testData/intentions/convertToExpressionBody/beforeAnonymousObjectExpression.kt

@@ -0,0 +1,12 @@
+// "Convert to expression body" "true"
+trait I {
+    fun foo(): String
+}
+
+fun bar(): I {
+    <caret>return object: I {
+        override fun foo(): String {
+            return "a"
+        }
+    }
+}

idea/testData/intentions/convertToExpressionBody/beforeAssignment.kt

@@ -0,0 +1,8 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+var a = 1
+var b = 2
+
+fun foo() {
+    <caret>a = b
+}

idea/testData/intentions/convertToExpressionBody/beforeDeclaration.kt

@@ -0,0 +1,5 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo() {
+    <caret>val v = 1
+}

idea/testData/intentions/convertToExpressionBody/beforeExpressionWithReturns1.kt

@@ -0,0 +1,7 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo(p: Boolean): String {
+    return bar() ?: return "a"
+}
+
+fun bar(): String? = null

idea/testData/intentions/convertToExpressionBody/beforeExpressionWithReturns2.kt

@@ -0,0 +1,10 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo(p: Boolean): String {
+    if (p) {
+        <caret>return "abc"
+    }
+    else {
+        return "def"
+    }
+}

idea/testData/intentions/convertToExpressionBody/beforeFunWithImplicitUnitTypeWithThrow.kt

@@ -0,0 +1,4 @@
+// "Convert to expression body" "true"
+fun foo() {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/intentions/convertToExpressionBody/beforeFunWithNoBlock.kt

@@ -0,0 +1,3 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo() = <caret>"abc"

idea/testData/intentions/convertToExpressionBody/beforeFunWithNothingType.kt

@@ -0,0 +1,4 @@
+// "Convert to expression body" "true"
+fun foo(): Nothing {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/intentions/convertToExpressionBody/beforeFunWithReturn.kt

@@ -0,0 +1,4 @@
+// "Convert to expression body" "true"
+fun <caret>foo(): String {
+    return "abc"
+}

idea/testData/intentions/convertToExpressionBody/beforeFunWithUnitType.kt

@@ -0,0 +1,6 @@
+// "Convert to expression body" "true"
+fun foo() {
+    <caret>bar()
+}
+
+fun bar() { }

idea/testData/intentions/convertToExpressionBody/beforeFunWithUnitType2.kt

@@ -0,0 +1,7 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo() {
+    <caret>bar()
+}
+
+fun bar(): String = "abc"

idea/testData/intentions/convertToExpressionBody/beforeFunWithUnitTypeWithThrow.kt

@@ -0,0 +1,4 @@
+// "Convert to expression body" "true"
+fun foo(): Unit {
+    <caret>throw UnsupportedOperationException()
+}

idea/testData/intentions/convertToExpressionBody/beforeFunctionLiteral.kt

@@ -0,0 +1,9 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo(handler: () -> Unit) { }
+
+fun bar() {
+    foo { <caret>zoo() }
+}
+
+fun zoo(){}

idea/testData/intentions/convertToExpressionBody/beforeGetWithReturn.kt

@@ -0,0 +1,5 @@
+// "Convert to expression body" "true"
+val foo: String
+    <caret>get() {
+        return "abc"
+    }

idea/testData/intentions/convertToExpressionBody/beforeMultipleStatements.kt

@@ -0,0 +1,6 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo(): String {
+    val v = 1
+    <caret>return "abc"
+}

idea/testData/intentions/convertToExpressionBody/beforeReturnWithNoValue.kt

@@ -0,0 +1,5 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo() {
+    <caret>return
+}

idea/testData/intentions/convertToExpressionBody/beforeWhile.kt

@@ -0,0 +1,5 @@
+// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+
+fun foo(p: Boolean): String {
+    <caret>while(true) { }
+}