No more usages of createReturn(text)

idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt

@@ -157,7 +157,8 @@ abstract class OutputValueBoxer(val outputValues: List<OutputValue>) {
     abstract val boxingRequired: Boolean
 
     fun getReturnExpression(arguments: List<String>, psiFactory: JetPsiFactory): JetReturnExpression? {
-        return getBoxingExpressionText(arguments)?.let { psiFactory.createReturn(it) }
+        val expressionText = getBoxingExpressionText(arguments) ?: return null
+        return psiFactory.createExpression("return $expressionText") as JetReturnExpression
     }
 
     protected abstract fun extractExpressionByIndex(boxedExpression: JetExpression, index: Int): JetExpression?

idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt

@@ -515,8 +515,7 @@ fun ExtractionGeneratorConfiguration.generateDeclaration(
                     lastExpression to null
                 }
 
-        val returnExpression = descriptor.controlFlow.outputValueBoxer.getReturnExpression(getReturnArguments(defaultExpression), psiFactory)
-        if (returnExpression == null) return
+        val returnExpression = descriptor.controlFlow.outputValueBoxer.getReturnExpression(getReturnArguments(defaultExpression), psiFactory) ?: return
 
         when(generatorOptions.target) {
             ExtractionTarget.LAZY_PROPERTY, ExtractionTarget.FAKE_LAMBDALIKE_FUNCTION -> {