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/convertToBlockBody/.intention

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

idea/testData/intentions/convertToBlockBody/beforeExplicitlyNonUnitFun.kt

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

idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt

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

idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt.after

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

idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt

@@ -1,3 +1,2 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): String = bar()

idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt.after

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): String {
     return bar()

idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: XXX
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): XXX = bar()

idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt.after

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: XXX
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): XXX {

idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt

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

idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt.after

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 fun foo(): Unit {
     bar()
 }

idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt

@@ -1,3 +1,2 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): Unit = bar()

idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt.after

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 // ERROR: Unresolved reference: bar
 fun <caret>foo(): Unit {
     bar()

idea/testData/intentions/convertToBlockBody/funWithThrow.kt

@@ -1,2 +1,3 @@
-// "Convert to block body" "true"
+// WITH_RUNTIME
+
 fun <caret>foo(): String = throw UnsupportedOperationException()

idea/testData/intentions/convertToBlockBody/funWithThrow.kt.after

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

idea/testData/intentions/convertToBlockBody/getter.kt

@@ -1,3 +1,2 @@
-// "Convert to block body" "true"
 val foo: String
     <caret>get() = "abc"

idea/testData/intentions/convertToBlockBody/getter.kt.after

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

idea/testData/intentions/convertToBlockBody/getterWithThrow.kt

@@ -1,3 +1,4 @@
-// "Convert to block body" "true"
+// WITH_RUNTIME
+
 val foo: String
     <caret>get() = throw UnsupportedOperationException()

idea/testData/intentions/convertToBlockBody/getterWithThrow.kt.after

@@ -1,4 +1,5 @@
-// "Convert to block body" "true"
+// WITH_RUNTIME
+
 val foo: String
     get()  {
         throw UnsupportedOperationException()

idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt

@@ -1,2 +1,3 @@
-// "Convert to block body" "true"
+// WITH_RUNTIME
+
 fun <caret>foo() = java.io.File("x").toURI()

idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt.after

@@ -1,4 +1,5 @@
-// "Convert to block body" "true"
+// WITH_RUNTIME
+
 import java.net.URI
 
 fun foo(): URI {

idea/testData/intentions/convertToBlockBody/implicitlyTypedFunWithUnresolvedType.kt

@@ -1,3 +1,3 @@
-// "Convert to block body" "false"
+// IS_APPLICABLE: false
 // ERROR: Unresolved reference: bar
 fun <caret>foo() = bar()

idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt

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

idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt.after

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

idea/testData/intentions/convertToBlockBody/nothingFun.kt

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

idea/testData/intentions/convertToBlockBody/nothingFun.kt.after

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

idea/testData/intentions/convertToBlockBody/setter.kt

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 var foo: String
     get() = "abc"
     <caret>set(value) = doSet(value)

idea/testData/intentions/convertToBlockBody/setter.kt.after

@@ -1,4 +1,3 @@
-// "Convert to block body" "true"
 var foo: String
     get() = "abc"
     set(value)  {