Simplified CodeTransformationTest. Only one doTest method remains, intention class is moved to test data. Merged other intention tests (SpecifyTypeExplicitlyTest, ConvertToBlock/ExpressionBodyTest) into this one.

idea/testData/intentions/convertToExpressionBody/.intention

@@ -0,0 +1 @@
+org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction

idea/testData/intentions/convertToExpressionBody/afterFunWithReturn.kt

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

idea/testData/intentions/convertToExpressionBody/afterFunWithUnitType.kt

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

idea/testData/intentions/convertToExpressionBody/afterGetWithReturn.kt

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

idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt

@@ -1,4 +1,3 @@
-// "Convert to expression body" "true"
 trait I {
     fun foo(): String
 }

idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt.after

@@ -1,4 +1,3 @@
-// "Convert to expression body" "true"
 trait I {
     fun foo(): String
 }

idea/testData/intentions/convertToExpressionBody/assignment.kt

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

idea/testData/intentions/convertToExpressionBody/beforeAssignment.kt

@@ -1,8 +0,0 @@
-// "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

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

idea/testData/intentions/convertToExpressionBody/beforeFunWithNoBlock.kt

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

idea/testData/intentions/convertToExpressionBody/beforeFunWithUnitType2.kt

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

idea/testData/intentions/convertToExpressionBody/beforeMultipleStatements.kt

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

idea/testData/intentions/convertToExpressionBody/beforeReturnWithNoValue.kt

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

idea/testData/intentions/convertToExpressionBody/beforeWhile.kt

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

idea/testData/intentions/convertToExpressionBody/declaration.kt

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

idea/testData/intentions/convertToExpressionBody/expressionWithReturns1.kt

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

idea/testData/intentions/convertToExpressionBody/expressionWithReturns2.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+// IS_APPLICABLE: false
 
 fun foo(p: Boolean): String {
     if (p) {

idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt

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

idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt.after

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

idea/testData/intentions/convertToExpressionBody/funWithNoBlock.kt

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

idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt

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

idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt.after

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

idea/testData/intentions/convertToExpressionBody/funWithReturn.kt

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

idea/testData/intentions/convertToExpressionBody/funWithReturn.kt.after

@@ -0,0 +1 @@
+fun foo(): String = "abc"

idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt

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

idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt.after

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

idea/testData/intentions/convertToExpressionBody/funWithUnitType2.kt

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

idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt

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

idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt.after

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

idea/testData/intentions/convertToExpressionBody/functionLiteral.kt

@@ -1,4 +1,4 @@
-// "class org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction" "false"
+// IS_APPLICABLE: false
 
 fun foo(handler: () -> Unit) { }
 

idea/testData/intentions/convertToExpressionBody/getWithReturn.kt

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

idea/testData/intentions/convertToExpressionBody/getWithReturn.kt.after

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

idea/testData/intentions/convertToExpressionBody/multipleStatements.kt

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

idea/testData/intentions/convertToExpressionBody/returnWithNoValue.kt

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

idea/testData/intentions/convertToExpressionBody/while.kt

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