azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat: unfold return to ...

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-01-29 18:01:10 +03:00
parent 3a81be6cfb
commit 1f8e2a1057
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt
+3 -1
View File
@@ -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>(KtReturnExpression::class.java, "Replace return with 'if' expression"), LowPriorityAction {
class UnfoldReturnToIfIntention : LowPriorityAction, SelfTargetingRangeIntention<KtReturnExpression>(
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)
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt
+3 -1
View File
@@ -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>(KtReturnExpression::class.java, "Replace return with 'when' expression"), LowPriorityAction {
class UnfoldReturnToWhenIntention : LowPriorityAction, SelfTargetingRangeIntention<KtReturnExpression>(
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