From 1f8e2a105729ed7f997475981962c89b3adf2760 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 29 Jan 2018 18:01:10 +0300 Subject: [PATCH] Reformat: unfold return to ... --- .../intentions/UnfoldReturnToIfIntention.kt | 4 +++- .../intentions/UnfoldReturnToWhenIntention.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt index fb1ed05c222..07850c28bb5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt @@ -30,7 +30,9 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.types.typeUtil.isNothing -class UnfoldReturnToIfIntention : SelfTargetingRangeIntention(KtReturnExpression::class.java, "Replace return with 'if' expression"), LowPriorityAction { +class UnfoldReturnToIfIntention : LowPriorityAction, SelfTargetingRangeIntention( + KtReturnExpression::class.java, "Replace return with 'if' expression" +) { override fun applicabilityRange(element: KtReturnExpression): TextRange? { val ifExpression = element.returnedExpression as? KtIfExpression ?: return null return TextRange(element.startOffset, ifExpression.ifKeyword.endOffset) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt index 7024d723a9e..0afb9ca3ef7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt @@ -27,7 +27,9 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis import org.jetbrains.kotlin.psi.psiUtil.startOffset -class UnfoldReturnToWhenIntention : SelfTargetingRangeIntention(KtReturnExpression::class.java, "Replace return with 'when' expression"), LowPriorityAction { +class UnfoldReturnToWhenIntention : LowPriorityAction, SelfTargetingRangeIntention( + KtReturnExpression::class.java, "Replace return with 'when' expression" +) { override fun applicabilityRange(element: KtReturnExpression): TextRange? { val whenExpr = element.returnedExpression as? KtWhenExpression ?: return null if (!KtPsiUtil.checkWhenExpressionHasSingleElse(whenExpr)) return null