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

"Remove redundant 'if'" now works correctly with labeled return

Browse Source 
So #KT-23109 Fixed
This commit is contained in:
Toshiaki Kameyama
2018-03-06 03:45:40 +03:00
committed by Mikhail Glukhikh
parent 733cb42ced
commit 5d1f5d9bca
4 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RedundantIfInspection.kt
+18 -10
View File
@@ -21,10 +21,12 @@ class RedundantIfInspection : AbstractKotlinInspection(), CleanupLocalInspection
val (redundancyType, branchType) = RedundancyType.of(expression)
if (redundancyType == RedundancyType.NONE) return@ifExpressionVisitor
holder.registerProblem(expression,
"Redundant 'if' statement",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
RemoveRedundantIf(redundancyType, branchType))
holder.registerProblem(
expression,
"Redundant 'if' statement",
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
RemoveRedundantIf(redundancyType, branchType)
)
}
}
@@ -33,6 +35,8 @@ class RedundantIfInspection : AbstractKotlinInspection(), CleanupLocalInspection
object Return : BranchType()
data class LabeledReturn(val label: String) : BranchType()
class Assign(val lvalue: KtExpression) : BranchType() {
override fun equals(other: Any?) = other is Assign && lvalue.text == other.lvalue.text
@@ -60,7 +64,10 @@ class RedundantIfInspection : AbstractKotlinInspection(), CleanupLocalInspection
private fun KtExpression?.getBranchExpression(): Pair<KtExpression?, BranchType>? {
return when (this) {
is KtReturnExpression -> returnedExpression to BranchType.Return
is KtReturnExpression -> {
val branchType = labeledExpression?.let { BranchType.LabeledReturn(it.text) } ?: BranchType.Return
returnedExpression to branchType
}
is KtBlockExpression -> statements.singleOrNull()?.getBranchExpression()
is KtBinaryExpression -> if (operationToken == KtTokens.EQ && left != null)
right to BranchType.Assign(left!!)
@@ -87,11 +94,12 @@ class RedundantIfInspection : AbstractKotlinInspection(), CleanupLocalInspection
}
val factory = KtPsiFactory(element)
element.replace(
when (branchType) {
is BranchType.Return -> factory.createExpressionByPattern("return $0", condition)
is BranchType.Assign -> factory.createExpressionByPattern("$0 = $1", branchType.lvalue, condition)
else -> condition
}
when (branchType) {
is BranchType.Return -> factory.createExpressionByPattern("return $0", condition)
is BranchType.LabeledReturn -> factory.createExpressionByPattern("return${branchType.label} $0", condition)
is BranchType.Assign -> factory.createExpressionByPattern("$0 = $1", branchType.lvalue, condition)
else -> condition
}
)
}
}