From 9cb42944d1574981ae3eaf238a0374d6fdcf3c03 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 12 Mar 2015 16:15:35 +0300 Subject: [PATCH] Extraction Engine: Generate function/property accessor with expression body (whenever applicable) #KT-6405 Fixed --- .../org/jetbrains/kotlin/psi/JetPsiFactory.kt | 9 +++++ .../extractFunctionForDebuggerUtil.kt | 10 ++--- .../ConvertToExpressionBodyAction.kt | 25 +++++++++--- .../ExtractableCodeDescriptor.kt | 3 +- .../extractableAnalysisUtil.kt | 8 +++- .../extractionEngine/extractorUtil.kt | 38 ++++++++----------- .../basic/localExtraction.kt.after | 4 +- .../noConflictWithInnerFunction.kt.after | 4 +- .../basic/traitFunction.kt.after | 4 +- .../evalExprInIfCondition.kt.after | 4 +- .../evalExprInIfElse.kt.after | 4 +- .../evalExprInIfThen.kt.after | 4 +- .../evalExprInWhenBranch.kt.after | 4 +- .../evalExprInWhenCondition.kt.after | 4 +- .../evalExprInWhenSubject.kt.after | 4 +- .../evalExpressionBodyFunction.kt.after | 4 +- .../evaluateExpression/evalIfExpr.kt.after | 4 +- .../simpleEvalExpr.kt.after | 4 +- .../trailingLambdaEmptyArgList.kt.after | 4 +- .../trailingLambdaNoArgList.kt.after | 4 +- .../trailingLambdaNonEmptyArgList.kt.after | 4 +- ...ambdaNonEmptyArgListWithNamedArgs.kt.after | 4 +- .../throws/evalExpressionWithThrow.kt.after | 4 +- .../defaultContainer/anonymousObject.kt.after | 4 +- .../defaultContainer/classFunction.kt.after | 4 +- .../defaultContainer/lambda.kt.after | 4 +- .../defaultContainer/localClass.kt.after | 4 +- .../defaultContainer/localFunction.kt.after | 4 +- .../defaultContainer/nestedLambda.kt.after | 4 +- .../topLevelFunction.kt.after | 4 +- .../delegationByExpression.kt.after | 4 +- .../delegationByExpressionFull.kt.after | 4 +- .../delegation/delegationBySuperCall.kt.after | 4 +- .../duplicates/insertAfterDuplicates.kt.after | 4 +- .../insertBeforeDuplicates.kt.after | 4 +- .../duplicates/nestedStrongMatch.kt.after | 4 +- .../duplicates/notNullAssertion.kt.after | 4 +- .../duplicates/singleExpression.kt.after | 4 +- .../accessors/memberProperty.kt.after | 4 +- .../memberPropertyWithLambda.kt.after | 4 +- .../accessors/topLevelProperty.kt.after | 4 +- .../topLevelPropertyWithLambda.kt.after | 4 +- .../classes/classInitializer.kt.after | 4 +- .../classInitializerWithLambda.kt.after | 4 +- .../classes/classParameters.kt.after | 4 +- .../classParametersWithLambda.kt.after | 4 +- .../functions/localFunction.kt.after | 4 +- .../localFunctionWithLambda.kt.after | 4 +- .../functions/memberFunction.kt.after | 4 +- .../memberFunctionParameters.kt.after | 4 +- ...emberFunctionParametersWithLambda.kt.after | 4 +- .../memberFunctionWithLambda.kt.after | 4 +- .../functions/topLevelFunction.kt.after | 4 +- .../topLevelFunctionParameters.kt.after | 4 +- ...LevelFunctionParametersWithLambda.kt.after | 4 +- .../topLevelFunctionWithLambda.kt.after | 4 +- .../properties/localProperty.kt.after | 4 +- .../localPropertyWithLambda.kt.after | 4 +- .../properties/memberProperty.kt.after | 4 +- .../memberPropertyWithLambda.kt.after | 4 +- .../properties/multiDeclaration.kt.after | 4 +- .../properties/topLevelProperty.kt.after | 4 +- .../topLevelPropertyWithLambda.kt.after | 4 +- .../flexibleTypesWithNull.kt.after | 4 +- .../flexibleTypesWithoutNull.kt.after | 4 +- .../explicitLabeledThisInMember.kt.after | 4 +- .../explicitThisInExtension.kt.after | 4 +- .../extractThis/explicitThisInMember.kt.after | 4 +- ...citAndExplicitLabeledThisInMember.kt.after | 4 +- ...mplicitAndExplicitThisInExtension.kt.after | 4 +- .../implicitThisInExtension.kt.after | 4 +- .../extractThis/implicitThisInMember.kt.after | 4 +- .../qualifiedThisAsArgument.kt.after | 4 +- .../parameters/it/innerIt.kt.after | 4 +- .../parameters/it/lambdaWithIt.kt.after | 4 +- .../parameters/it/outerIt.kt.after | 4 +- .../parameters/it/simpleIt.kt.after | 4 +- .../misc/multipleOccurrences.kt.after | 4 +- .../parameters/misc/usagesInCallArgs.kt.after | 4 +- .../simpleTypeParameter.kt.after | 4 +- ...simpleTypeParameterWithConstraint.kt.after | 4 +- .../typeParamInArgument.kt.after | 4 +- ...ParametersAndConstraintsCombined1.kt.after | 4 +- ...ParametersAndConstraintsCombined2.kt.after | 4 +- ...ParametersAndConstraintsCombined3.kt.after | 4 +- .../typeParametersCombined1.kt.after | 4 +- .../typeParametersCombined2.kt.after | 4 +- .../typeParametersCombined3.kt.after | 4 +- .../typeParametersCombinedAndThis.kt.after | 4 +- .../extractWithGetterToClass.kt.after | 4 +- .../extractWithGetterToFile.kt.after | 4 +- .../extractWithGetterToTrait.kt.after | 4 +- 92 files changed, 142 insertions(+), 295 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index d5f0af231ea..f473fa4bacf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt @@ -630,6 +630,15 @@ public class JetPsiFactory(private val project: Project) { return this } + public fun expressionBody(body: String): CallableBuilder { + assert(state == State.BODY || state == State.TYPE_CONSTRAINTS) + + sb.append(bodyPrefix()).append(" = ").append(body) + state = State.DONE + + return this + } + public fun initializer(body: String): CallableBuilder { assert(target == Target.READ_ONLY_PROPERTY && (state == State.BODY || state == State.TYPE_CONSTRAINTS)) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 0f0ae148eba..3b6b7f266b3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -101,11 +101,11 @@ fun getFunctionForExtractedFragment( throw EvaluateExceptionUtil.createEvaluateException("Following declarations are unavailable in debug scope: ${validationResult.conflicts.keySet().map { it.getText() }.joinToString(",")}") } - val config = ExtractionGeneratorConfiguration( - validationResult.descriptor, - ExtractionGeneratorOptions(inTempFile = true, flexibleTypesAllowed = true, allowDummyName = true) - ) - return config.generateDeclaration() + val generatorOptions = ExtractionGeneratorOptions(inTempFile = true, + flexibleTypesAllowed = true, + allowDummyName = true, + allowExpressionBody = false) + return ExtractionGeneratorConfiguration(validationResult.descriptor, generatorOptions).generateDeclaration() } return runReadAction { generateFunction() } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt index 8e940c49fd7..74bb281aa92 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt @@ -32,13 +32,17 @@ import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConvertToExpressionBodyAction : PsiElementBaseIntentionAction() { override fun getFamilyName(): String = JetBundle.message("convert.to.expression.body.action.family.name") - override fun isAvailable(project: Project, editor: Editor, element: PsiElement): Boolean { - setText(JetBundle.message("convert.to.expression.body.action.name")) + public fun isAvailable(element: PsiElement): Boolean { val data = calcData(element) return data != null && !containsReturn(data.value) } - override fun invoke(project: Project, editor: Editor, element: PsiElement) { + override fun isAvailable(project: Project, editor: Editor, element: PsiElement): Boolean { + setText(JetBundle.message("convert.to.expression.body.action.name")) + return isAvailable(element) + } + + public fun invoke(element: PsiElement, editor: Editor? = null) { val (declaration, value) = calcData(element)!! if (!declaration.hasDeclaredReturnType() && declaration is JetNamedFunction) { @@ -55,12 +59,21 @@ public class ConvertToExpressionBodyAction : PsiElementBaseIntentionAction() { if (declaration.hasDeclaredReturnType() && declaration is JetCallableDeclaration && canOmitType(declaration)) { val typeRef = declaration.getTypeReference()!! val colon = declaration.getColon()!! - val range = TextRange(colon.getTextRange().getStartOffset(), typeRef.getTextRange().getEndOffset()) - editor.getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset()) - editor.getCaretModel().moveToOffset(range.getEndOffset()) + if (editor != null) { + val range = TextRange(colon.getTextRange().getStartOffset(), typeRef.getTextRange().getEndOffset()) + editor.getSelectionModel().setSelection(range.getStartOffset(), range.getEndOffset()) + editor.getCaretModel().moveToOffset(range.getEndOffset()) + } + else { + (declaration : PsiElement).deleteChildRange(colon, typeRef) + } } } + override fun invoke(project: Project, editor: Editor, element: PsiElement) { + invoke(element, editor) + } + private fun canOmitType(declaration: JetCallableDeclaration): Boolean { if (declaration.getModifierList()?.hasModifier(JetTokens.OVERRIDE_KEYWORD) ?: false) return true val descriptor = declaration.resolveToDescriptor() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt index 1472c8fc85b..166af5a6356 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt @@ -364,7 +364,8 @@ data class ExtractionGeneratorOptions( val inTempFile: Boolean = false, val target: ExtractionTarget = ExtractionTarget.FUNCTION, val flexibleTypesAllowed: Boolean = false, - val allowDummyName: Boolean = false + val allowDummyName: Boolean = false, + val allowExpressionBody: Boolean = true ) { default object { val DEFAULT = ExtractionGeneratorOptions() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index 2b224e40f9d..4e3aad27f40 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -72,6 +72,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.kotlin.diagnostics.* import java.util.logging.* import com.intellij.openapi.diagnostic.Logger +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch private val DEFAULT_RETURN_TYPE = KotlinBuiltIns.getInstance().getUnitType() @@ -881,11 +882,14 @@ fun ExtractableCodeDescriptor.validate(): ExtractableCodeDescriptorWithConflicts val conflicts = MultiMap() - val result = ExtractionGeneratorConfiguration(this, ExtractionGeneratorOptions(inTempFile = true)).generateDeclaration() + val result = ExtractionGeneratorConfiguration( + this, + ExtractionGeneratorOptions(inTempFile = true, allowExpressionBody = false) + ).generateDeclaration() val valueParameterList = (result.declaration as? JetNamedFunction)?.getValueParameterList() val body = result.declaration.getGeneratedBody() - val bindingContext = body.analyze() + val bindingContext = body.analyzeFully() fun validateBody() { for ((originalOffset, resolveResult) in extractionData.refOffsetToDeclaration) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index 675310521a1..13f07916493 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -17,32 +17,17 @@ package org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder -import org.jetbrains.kotlin.psi.JetNamedDeclaration -import org.jetbrains.kotlin.psi.JetPsiFactory -import java.util.LinkedHashMap -import java.util.Collections -import org.jetbrains.kotlin.psi.psiUtil.isFunctionLiteralOutsideParentheses -import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument -import org.jetbrains.kotlin.idea.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith -import org.jetbrains.kotlin.psi.psiUtil.appendElement -import org.jetbrains.kotlin.psi.psiUtil.replaced -import org.jetbrains.kotlin.psi.JetBlockExpression -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ParameterUpdate -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Jump -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Initializer -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ExpressionValue -import org.jetbrains.kotlin.psi.JetReturnExpression -import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns +import org.jetbrains.kotlin.idea.intentions.ConvertToExpressionBodyAction import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.* -import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.kotlin.idea.refactoring.isMultiLine +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ExpressionValue +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Initializer +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Jump +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ParameterUpdate import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValueBoxer.AsTuple +import org.jetbrains.kotlin.idea.refactoring.isMultiLine +import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match @@ -53,7 +38,6 @@ import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnifierParameter import org.jetbrains.kotlin.idea.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder -import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target import org.jetbrains.kotlin.psi.codeFragmentUtil.DEBUG_TYPE_REFERENCE_STRING import org.jetbrains.kotlin.psi.codeFragmentUtil.debugTypeInfo import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode @@ -526,6 +510,14 @@ fun ExtractionGeneratorConfiguration.generateDeclaration( !defaultValue.callSiteReturn -> replaceWithReturn(lastExpression!!, returnExpression, expressionToUnifyWith) } + + if (generatorOptions.allowExpressionBody) { + val convertToExpressionBody = ConvertToExpressionBodyAction() + val bodyExpression = body.getStatements().singleOrNull() + if (bodyExpression != null && !bodyExpression.isMultiLine() && convertToExpressionBody.isAvailable(body)) { + convertToExpressionBody.invoke(body) + } + } } fun insertDeclaration(declaration: JetNamedDeclaration, anchor: PsiElement): JetNamedDeclaration { diff --git a/idea/testData/refactoring/extractFunction/basic/localExtraction.kt.after b/idea/testData/refactoring/extractFunction/basic/localExtraction.kt.after index d31a3bc39c6..37279f6e8d3 100644 --- a/idea/testData/refactoring/extractFunction/basic/localExtraction.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/localExtraction.kt.after @@ -1,8 +1,6 @@ fun foo(a: Int): Int { // SIBLING: - fun i(): Int { - return a + 10 - } + fun i() = a + 10 return i() } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt.after b/idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt.after index 70c1d24a465..b9aa1d825e0 100644 --- a/idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt.after @@ -1,9 +1,7 @@ fun foo() { val a = 1 // SIBLING: - fun b1(): Boolean { - return a > 0 - } + fun b1() = a > 0 if (b1()) { fun b(): Int { return 0 } diff --git a/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after b/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after index 8bf470fe2dc..47587cb7b4f 100644 --- a/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/basic/traitFunction.kt.after @@ -3,7 +3,5 @@ trait T{ return i() } - fun i(): Int { - return 1 - } + fun i() = 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after index bc97f97bbd6..4e8fef11282 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt.after @@ -8,6 +8,4 @@ fun foo(a: Int): Int { return if (b(a, b)) 1 else if (a - b < 0) 2 else b } -private fun b(a: Int, b: Int): Boolean { - return a + b > 0 -} +private fun b(a: Int, b: Int) = a + b > 0 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after index dbeb267dc47..c77a1117104 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt.after @@ -8,6 +8,4 @@ fun foo(a: Int): Int { return if (a + b > 0) 1 else i(a, b) } -private fun i(a: Int, b: Int): Int { - return if (a - b < 0) 2 else b -} +private fun i(a: Int, b: Int) = if (a - b < 0) 2 else b diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after index 99db87af6e4..e32b3ab630a 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt.after @@ -4,6 +4,4 @@ fun foo(a: Int): Int { return if (a + b > 0) i() else if (a - b < 0) 2 else b } -private fun i(): Int { - return 1 -} +private fun i() = 1 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after index 50a0a9270c9..d5602f79d08 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt.after @@ -10,6 +10,4 @@ fun foo(a: Int): Int { } } -private fun i(b: Int): Int { - return b -} +private fun i(b: Int) = b diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after index 96aa63fb28f..bb17c74dcd9 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt.after @@ -8,6 +8,4 @@ fun foo(a: Int): Int { } } -private fun i(): Int { - return 0 -} +private fun i() = 0 diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after index d55b7f73176..4b80bb742e5 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt.after @@ -12,6 +12,4 @@ fun foo(a: Int): Int { } } -private fun i(a: Int, b: Int): Int { - return a + b -} +private fun i(a: Int, b: Int) = a + b diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after index 9d2130f69e2..3d1ea8fbd7b 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt.after @@ -5,6 +5,4 @@ // SIBLING: fun foo(a: Int, b: Int): Int = i(a, b) -private fun i(a: Int, b: Int): Int { - return a + b -} +private fun i(a: Int, b: Int) = a + b diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after index 5807a2c431d..50496f1c0b1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt.after @@ -8,6 +8,4 @@ fun foo(a: Int): Int { return i(a, b) } -private fun i(a: Int, b: Int): Int { - return if (a + b > 0) 1 else if (a - b < 0) 2 else b -} \ No newline at end of file +private fun i(a: Int, b: Int) = if (a + b > 0) 1 else if (a - b < 0) 2 else b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after index 3a6d42641e6..a32877feb70 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt.after @@ -8,6 +8,4 @@ fun foo(a: Int): Int { return i(a, b) } -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after index b61f7c3f7ea..c6b712f7ec1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt.after @@ -5,6 +5,4 @@ fun foo(t: Array) { t.check(function()) } -private fun function(): (Int) -> Boolean { - return { it + 1 > 1 } -} \ No newline at end of file +private fun function() = { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after index b61f7c3f7ea..c6b712f7ec1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt.after @@ -5,6 +5,4 @@ fun foo(t: Array) { t.check(function()) } -private fun function(): (Int) -> Boolean { - return { it + 1 > 1 } -} \ No newline at end of file +private fun function() = { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after index 08b20b64d6c..ccd3523d03f 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt.after @@ -5,6 +5,4 @@ fun foo(t: Array) { t.check(1, 2, function()) } -private fun function(): (Int) -> Boolean { - return { it + 1 > 1 } -} \ No newline at end of file +private fun function() = { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt.after index 2eadb35c20b..2c2d6d156e1 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgListWithNamedArgs.kt.after @@ -5,6 +5,4 @@ fun foo(t: Array) { t.check(a = 1, b = 2, f = function()) } -private fun function(): (Int) -> Boolean { - return { it + 1 > 1 } -} \ No newline at end of file +private fun function() = { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after index bf472a990f1..bf1edca8c5d 100644 --- a/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after +++ b/idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt.after @@ -11,6 +11,4 @@ fun foo(a: Int): Int { return t } -private fun i(a: Int, b: Int): Int { - return if (a > 0) throw Exception("") else a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = if (a > 0) throw Exception("") else a + b diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after index 6d8c34e23b3..ee49b1ddff9 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt.after @@ -5,9 +5,7 @@ class A { return i() } - private fun i(): Int { - return a + b - 1 - } + private fun i() = a + b - 1 } } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after index 9fb4d8d44ab..c71ea9ac474 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt.after @@ -8,8 +8,6 @@ class A { return i(a, b) } - private fun i(a: Int, b: Int): Int { - return a + b - 1 - } + private fun i(a: Int, b: Int) = a + b - 1 } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after index da233e99f55..c8bc8f0eabf 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt.after @@ -9,7 +9,5 @@ class A { }.invoke() } - private fun i(a: Int, b: Int): Int { - return a + b - 1 - } + private fun i(a: Int, b: Int) = a + b - 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after index 6e83fa52afd..8336d6fbe66 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt.after @@ -5,9 +5,7 @@ class A { return i() } - private fun i(): Int { - return a + b - 1 - } + private fun i() = a + b - 1 } return L().invoke() diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt.after index 5c82ef791a1..c20411a1d9f 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt.after @@ -1,7 +1,5 @@ fun foo(a: Int, b: Int): Int { - fun i(): Int { - return a + b - 1 - } + fun i() = a + b - 1 fun bar() { return i() diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after index ef8b88d4cdd..5b8f65b757b 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt.after @@ -9,7 +9,5 @@ class A { }.invoke() } - private fun i(a: Int, b: Int): Int { - return a + b - 1 - } + private fun i(a: Int, b: Int) = a + b - 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after index 08e149c94ae..2513a365950 100644 --- a/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt.after @@ -6,6 +6,4 @@ fun foo(a: Int, b: Int): Int { return i(a, b) } -private fun i(a: Int, b: Int): Int { - return a + b - 1 -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b - 1 \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after index b67dbad0cb3..3a01bea0694 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt.after @@ -8,6 +8,4 @@ class A(a: Int, b: Int): T class B(a: Int, b: Int): T by A(i(a, b), a - b) -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after index 82130be2a9a..b26ceb9cde4 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt.after @@ -6,6 +6,4 @@ class A(a: Int, b: Int): T class B(t: T): T by t(t) -private fun t(t: T): T { - return t -} \ No newline at end of file +private fun t(t: T) = t \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after index 38482ecbc93..dc352fc6967 100644 --- a/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after +++ b/idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt.after @@ -6,6 +6,4 @@ open class A(a: Int, b: Int) class B(a: Int, b: Int): A(i(a, b), a - b) -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt.after b/idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt.after index 803c3b4cb5d..fa98784eacc 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/insertAfterDuplicates.kt.after @@ -3,7 +3,5 @@ class A { val x = i() val y = i() - private fun i(): Int { - return 1 + 1 - } + private fun i() = 1 + 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt.after b/idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt.after index 73471d54810..8425c63b552 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/insertBeforeDuplicates.kt.after @@ -4,6 +4,4 @@ fun foo() { val y = i() } -private fun i(): Int { - return 1 + 1 -} \ No newline at end of file +private fun i() = 1 + 1 diff --git a/idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt.after b/idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt.after index 848ec41d86f..38f36a6be48 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/nestedStrongMatch.kt.after @@ -5,6 +5,4 @@ fun main(args: Array) { val y = i() } -private fun i(): Int { - return 1 + 1 -} \ No newline at end of file +private fun i() = 1 + 1 diff --git a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after index 791261b7924..45bc17121e8 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/notNullAssertion.kt.after @@ -11,6 +11,4 @@ fun foo(): Int { } } -private fun i(s: String?): Int { - return s!!.length -} \ No newline at end of file +private fun i(s: String?) = s!!.length \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after index fa05e1dd712..b92b91c484f 100644 --- a/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after +++ b/idea/testData/refactoring/extractFunction/duplicates/singleExpression.kt.after @@ -24,6 +24,4 @@ fun bar() { i(f(), f()) } -private fun i(a: Int, b: Int): Int { - return a + b * a -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b * a \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after index 275f049d19c..fbb45d11a78 100644 --- a/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt.after @@ -1,7 +1,5 @@ class A(val a: Int, val b: Int) { val foo: Int get() = i() - 1 - private fun i(): Int { - return a + b - } + private fun i() = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after index ce8c8a4bcfa..382755f1c15 100644 --- a/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt.after @@ -1,7 +1,5 @@ class A(val a: Int, val b: Int) { val foo: Int get() = { i() - 1 }.invoke() - private fun i(): Int { - return a + b - } + private fun i() = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after index 6377c8a8614..c11dbda8179 100644 --- a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt.after @@ -2,6 +2,4 @@ val a = 1 val b = 1 val foo: Int get() = i() - 1 -private fun i(): Int { - return a + b -} \ No newline at end of file +private fun i() = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after index d3524835e29..3423e0c3d43 100644 --- a/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt.after @@ -2,6 +2,4 @@ val a = 1 val b = 1 val foo: Int get() = { i() - 1 }.invoke() -private fun i(): Int { - return a + b -} \ No newline at end of file +private fun i() = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after index 88118357111..2fd4fe55ba9 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt.after @@ -5,7 +5,5 @@ class A(val a: Int, b: Int) { println(i(b) - 1) } - private fun i(b: Int): Int { - return a + b - } + private fun i(b: Int) = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after index 5892c73e83f..a363d71d029 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt.after @@ -5,7 +5,5 @@ class A(val a: Int, b: Int) { println({ i(b) - 1 }.invoke()) } - private fun i(b: Int): Int { - return a + b - } + private fun i(b: Int) = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after index 98330fba5a8..ad92bebbf68 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt.after @@ -3,6 +3,4 @@ val n = 1 class A(val a: Int, val b: Int = i(a)) -private fun i(a: Int): Int { - return a + n -} \ No newline at end of file +private fun i(a: Int) = a + n \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after index e1704cd99ae..06b623b5c02 100644 --- a/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt.after @@ -3,6 +3,4 @@ val n = 1 class A(val a: Int, val b: Int = { i(a) }.invoke()) -private fun i(a: Int): Int { - return a + n -} \ No newline at end of file +private fun i(a: Int) = a + n \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after index 5f228f4a57e..4872cd85cd6 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt.after @@ -3,9 +3,7 @@ // PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { - fun i(a: Int, b: Int): Int { - return a + b - n - } + fun i(a: Int, b: Int) = a + b - n fun foo(a: Int, b: Int) = i(a, b) - 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after index 555d9a5e042..70b32d99ff3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt.after @@ -3,9 +3,7 @@ // PARAM_DESCRIPTOR: value-parameter val a: kotlin.Int defined in bar.foo // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in bar.foo fun bar(n: Int) { - fun i(a: Int, b: Int): Int { - return a + b - n - } + fun i(a: Int, b: Int) = a + b - n fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke() } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after index f8871700531..267cd960e55 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt.after @@ -5,7 +5,5 @@ class A(val n: Int) { fun foo(a: Int, b: Int) = i(a, b) - 1 - private fun i(a: Int, b: Int): Int { - return a + b - n - } + private fun i(a: Int, b: Int) = a + b - n } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after index 5250948c2e2..f86a3e3b3e0 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt.after @@ -3,7 +3,5 @@ class A(val n: Int) { fun foo(a: Int, b: Int = i(a)) = a + b - n - 1 - private fun i(a: Int): Int { - return a + n - } + private fun i(a: Int) = a + n } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after index 8371f67d128..65fdf41f7aa 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt.after @@ -3,7 +3,5 @@ class A(val n: Int) { fun foo(a: Int, b: Int = { i(a) }.invoke()) = a + b - n - 1 - private fun i(a: Int): Int { - return a + n - } + private fun i(a: Int) = a + n } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after index 991923ea0f5..683d5cf92e3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt.after @@ -5,7 +5,5 @@ class A(val n: Int) { fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke() - private fun i(a: Int, b: Int): Int { - return a + b - n - } + private fun i(a: Int, b: Int) = a + b - n } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after index 298af37095d..65e8e5f4716 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt.after @@ -4,6 +4,4 @@ // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo fun foo(a: Int, b: Int) = i(a, b) - 1 -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after index de79125b4ca..6c288a5aaf3 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt.after @@ -3,6 +3,4 @@ val n = 1 fun foo(a: Int, b: Int = i(a)) = a + b - 1 -private fun i(a: Int): Int { - return a + n -} \ No newline at end of file +private fun i(a: Int) = a + n \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after index 94de47c5168..f4c6bdd7e09 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt.after @@ -3,6 +3,4 @@ val n = 1 fun foo(a: Int, b: Int = { i(a) }) = a + b - 1 -private fun i(a: Int): Int { - return a + n -} \ No newline at end of file +private fun i(a: Int) = a + n \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after index 06103916308..a8f1f14ef71 100644 --- a/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt.after @@ -4,6 +4,4 @@ // PARAM_DESCRIPTOR: value-parameter val b: kotlin.Int defined in foo fun foo(a: Int, b: Int) = { i(a, b) - 1 }.invoke() -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after index c4f363e52d5..afe9c454150 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt.after @@ -6,6 +6,4 @@ fun bar(a: Int, b: Int) { val foo = i(a, b) - 1 } -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after index ea272ef71f1..f9a7ab5cfa4 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt.after @@ -6,6 +6,4 @@ fun bar(a: Int, b: Int) { val foo = { i(a, b) - 1 }.invoke() } -private fun i(a: Int, b: Int): Int { - return a + b -} \ No newline at end of file +private fun i(a: Int, b: Int) = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after index aa845ac1c95..4205c3d2a86 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt.after @@ -3,7 +3,5 @@ class A(val a: Int, b: Int) { val foo = i(b) - 1 - private fun i(b: Int): Int { - return a + b - } + private fun i(b: Int) = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after index a57f0927b71..39076c760ad 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt.after @@ -3,7 +3,5 @@ class A(val a: Int, b: Int) { val foo = { i(b) - 1 }.invoke() - private fun i(b: Int): Int { - return a + b - } + private fun i(b: Int) = a + b } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt.after index 29ae7bace4b..17c464c368f 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt.after @@ -4,6 +4,4 @@ fun foo() { val (a, b) = pair() } -private fun pair(): Pair { - return 1 to 2 -} \ No newline at end of file +private fun pair() = 1 to 2 \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after index cd460da332a..b586413332a 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt.after @@ -2,6 +2,4 @@ val a = 1 val b = 1 val foo = i() - 1 -private fun i(): Int { - return a + b -} \ No newline at end of file +private fun i() = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after index d353623e271..930b59d6894 100644 --- a/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after +++ b/idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt.after @@ -2,6 +2,4 @@ val a = 1 val b = 1 val foo = { i() - 1 }.invoke() -private fun i(): Int { - return a + b -} \ No newline at end of file +private fun i() = a + b \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after index c2e5bc1ee69..a687e4b9262 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithNull.kt.after @@ -7,6 +7,4 @@ fun test() { val n = i(property) } -private fun i(property: String?): Int? { - return property?.length() -} \ No newline at end of file +private fun i(property: String?) = property?.length() diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after index 7764b89d20a..559b5d08cf7 100644 --- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/flexibleTypesWithoutNull.kt.after @@ -7,6 +7,4 @@ fun test() { val n = i(property) } -private fun i(property: String): Int { - return property.length() -} \ No newline at end of file +private fun i(property: String) = property.length() diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after index 982120eef76..cae3248e76a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt.after @@ -19,6 +19,4 @@ public class A(): Z() { } } -private fun i(a1: A, b1: A.B): Int { - return a1.a + b1.b + a1.z + b1.z -} +private fun i(a1: A, b1: A.B) = a1.a + b1.b + a1.z + b1.z diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after index 1baa3dabc9b..a6baa7d23bc 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt.after @@ -7,6 +7,4 @@ fun Z.foo(): Int { return i() + 1 } -private fun Z.i(): Int { - return this.a -} +private fun Z.i() = this.a diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after index f9ccc19f7d5..8e9466a4861 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt.after @@ -19,6 +19,4 @@ public class A(): Z() { } } -private fun i(a1: A, b1: A.B): Int { - return a1.a + b1.b + b1.z -} +private fun i(a1: A, b1: A.B) = a1.a + b1.b + b1.z diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after index 982120eef76..cae3248e76a 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt.after @@ -19,6 +19,4 @@ public class A(): Z() { } } -private fun i(a1: A, b1: A.B): Int { - return a1.a + b1.b + a1.z + b1.z -} +private fun i(a1: A, b1: A.B) = a1.a + b1.b + a1.z + b1.z diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after index b9a52ffa800..ac678d845a1 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt.after @@ -7,6 +7,4 @@ fun Z.foo(): Int { return i() + 1 } -private fun Z.i(): Int { - return this.a + a -} +private fun Z.i() = this.a + a diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after index 67702f4f54b..6ef8228970e 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt.after @@ -7,6 +7,4 @@ fun Z.foo(): Int { return i() + 1 } -private fun Z.i(): Int { - return a -} +private fun Z.i() = a diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after index 209f3130c15..b3abbc638c0 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt.after @@ -19,6 +19,4 @@ public class A(): Z() { } } -private fun i(a1: A, b1: A.B): Int { - return a1.a + b1.b + b1.z -} +private fun i(a1: A, b1: A.B) = a1.a + b1.b + b1.z diff --git a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after index 73dd09c44bc..aa4222d15b5 100644 --- a/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/extractThis/qualifiedThisAsArgument.kt.after @@ -9,9 +9,7 @@ class A { fun B.foo() = i(this@A, this) } -private fun i(a1: A, b: B): Int { - return a1.a + b.b -} +private fun i(a1: A, b: B) = a1.a + b.b class B { val b = 1 diff --git a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after index fe375cc9a6e..50bfdecc7e8 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt.after @@ -9,6 +9,4 @@ fun foo(t: Array>) { } } -private fun i(it: Int): Int { - return it + 1 -} \ No newline at end of file +private fun i(it: Int) = it + 1 \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after index 20efe186be4..fddd9bd25bc 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt.after @@ -9,6 +9,4 @@ fun foo(t: Array) { } } -private fun b(t: Array): Boolean { - return t.check { it + 1 > 1 } -} \ No newline at end of file +private fun b(t: Array) = t.check { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after index a330c422ccb..5f054e65f1d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt.after @@ -9,6 +9,4 @@ fun foo(t: Array>) { } } -private fun b(it: Array): Boolean { - return it.check { it + 1 > 1 } -} \ No newline at end of file +private fun b(it: Array) = it.check { it + 1 > 1 } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after index f6b2710b69b..27bd28e1a9b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt.after @@ -9,6 +9,4 @@ fun foo(t: Array) { } } -private fun i(it: Int): Int { - return it + 1 -} \ No newline at end of file +private fun i(it: Int) = it + 1 \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after index 1148a942e81..8fdd698de4d 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt.after @@ -9,6 +9,4 @@ fun foo(a: Int, b: Int, c: Int): Int { return i(a, b, c) } -private fun i(a: Int, b: Int, c: Int): Int { - return (a + b * a - c) + b * c -} +private fun i(a: Int, b: Int, c: Int) = (a + b * a - c) + b * c diff --git a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after index fc26f5cd677..ad5c515eb2b 100644 --- a/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after +++ b/idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt.after @@ -13,9 +13,7 @@ public class A() { } } -private fun i(a: A, t: Int, u: Int, x: Int): Int { - return a.bar(t - x, u + x) -} +private fun i(a: A, t: Int, u: Int, x: Int) = a.bar(t - x, u + x) fun foo(a: A, x: Int): Int { val t = 10 diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after index 4a73a17e311..1bb6ac53bbb 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after @@ -9,6 +9,4 @@ fun foo(v: V): Pair { return pair(v) } -private fun pair(v: V): Pair { - return Pair(v.x + 10, v) -} \ No newline at end of file +private fun pair(v: V) = Pair(v.x + 10, v) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after index 4fbb64dabd9..29e5f4e82a0 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after @@ -10,6 +10,4 @@ fun foo(v: V): Pair where V: DataEx { return pair(v) } -private fun pair(v: V): Pair where V : DataEx { - return Pair(v.x + 10, v) -} \ No newline at end of file +private fun pair(v: V) where V : DataEx = Pair(v.x + 10, v) \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after index a84e42aa78b..d3c2ffa1f61 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt.after @@ -9,6 +9,4 @@ class A { } } -private fun i(d: Data): Int { - return d.t + 1 -} \ No newline at end of file +private fun i(d: Data) = d.t + 1 \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after index 2065741344a..8d2568d9047 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after @@ -17,6 +17,4 @@ class A(val t: T) where T: DataEx { } } -private fun i(a: A, b: A.B, v: V): Int where T : DataEx, U : DataExEx, V : DataEx { - return a.t.x + b.u.x + v.x -} \ No newline at end of file +private fun i(a: A, b: A.B, v: V) where T : DataEx, U : DataExEx, V : DataEx = a.t.x + b.u.x + v.x \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after index 95036917478..255e798c423 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after @@ -14,7 +14,5 @@ class A(val t: T) where T: DataEx { } } - private fun B.i(v: V): Int where U : DataExEx, V : DataEx { - return t.x + u.x + v.x - } + private fun B.i(v: V) where U : DataExEx, V : DataEx = t.x + u.x + v.x } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after index e0406501ddd..1321103e3d0 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after @@ -11,8 +11,6 @@ class A(val t: T) where T: DataEx { return i(v) } - private fun i(v: V): Int where V : DataEx { - return t.x + u.x + v.x - } + private fun i(v: V) where V : DataEx = t.x + u.x + v.x } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after index 2f611906e74..baa80592fe3 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after @@ -15,6 +15,4 @@ class A(val t: T) { } } -private fun i(a: A, b: A.B, v: V): Int { - return a.t.x + b.u.x + v.x -} \ No newline at end of file +private fun i(a: A, b: A.B, v: V) = a.t.x + b.u.x + v.x \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after index 54c4810add5..5bb6cb0050e 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after @@ -12,7 +12,5 @@ class A(val t: T) { } } - private fun B.i(v: V): Int { - return t.x + u.x + v.x - } + private fun B.i(v: V) = t.x + u.x + v.x } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after index c9b688b9896..0ff43a3d75f 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after @@ -9,8 +9,6 @@ class A(val t: T) { return i(v) } - private fun i(v: V): Int { - return t.x + u.x + v.x - } + private fun i(v: V) = t.x + u.x + v.x } } \ No newline at end of file diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after index e3d6a429ba0..6cc1beee853 100644 --- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after +++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after @@ -12,6 +12,4 @@ class A(val t: T) where T: DataEx { } } -private fun A.i(v: V): Int where T : DataEx { - return t.x + v.x -} \ No newline at end of file +private fun A.i(v: V) where T : DataEx = t.x + v.x \ No newline at end of file diff --git a/idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt.after b/idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt.after index b8d8a178fe1..5ad86601888 100644 --- a/idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt.after +++ b/idea/testData/refactoring/introduceProperty/extractWithGetterToClass.kt.after @@ -3,9 +3,7 @@ class A(val n: Int = 1) { val m: Int = 2 private val i: Int - get() { - return m + n + 1 - } + get() = m + n + 1 fun foo(): Int { return i diff --git a/idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt.after b/idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt.after index 9fe3f71333a..749acc1aaed 100644 --- a/idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt.after +++ b/idea/testData/refactoring/introduceProperty/extractWithGetterToFile.kt.after @@ -2,9 +2,7 @@ val n: Int = 1 private val i: Int - get() { - return n + 1 - } + get() = n + 1 fun foo(): Int { return i diff --git a/idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after b/idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after index f0047910bff..8af70a973a6 100644 --- a/idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after +++ b/idea/testData/refactoring/introduceProperty/extractWithGetterToTrait.kt.after @@ -1,9 +1,7 @@ // EXTRACTION_TARGET: property with getter trait T { val i: Int - get() { - return 1 - } + get() = 1 fun foo(): Int { return i