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

Refactoring: ConstantConditionIfInspection

Browse Source 
Transform collectFixesAndRegisterProblem to just collectFixes
This commit is contained in:
Mikhail Glukhikh
2018-10-05 11:57:15 +03:00
parent 5c83c247d7
commit 248e09ff2c
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ConstantConditionIfInspection.kt
+24 -14
View File
@@ -26,38 +26,48 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ConstantConditionIfInspection : AbstractKotlinInspection() { class ConstantConditionIfInspection : AbstractKotlinInspection() {
override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor { override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
return ifExpressionVisitor { expression -> collectFixesAndRegisterProblem(expression, holder) } return ifExpressionVisitor { expression ->
val constantValue = expression.getConditionConstantValueIfAny() ?: return@ifExpressionVisitor
val fixes = collectFixes(expression, constantValue)
holder.registerProblem(
expression.condition!!,
"Condition is always '$constantValue'",
*fixes.toTypedArray()
)
}
} }
companion object { companion object {
private fun collectFixesAndRegisterProblem(expression: KtIfExpression, holder: ProblemsHolder?): List<ConstantConditionIfFix> { private fun KtIfExpression.getConditionConstantValueIfAny(): Boolean? {
val condition = expression.condition ?: return emptyList() val context = condition?.analyze(BodyResolveMode.PARTIAL_WITH_CFA) ?: return null
return condition?.constantBooleanValue(context)
val context = condition.analyze(BodyResolveMode.PARTIAL_WITH_CFA) }
val constantValue = condition.constantBooleanValue(context) ?: return emptyList()
private fun collectFixes(
expression: KtIfExpression,
constantValue: Boolean? = expression.getConditionConstantValueIfAny()
): List<ConstantConditionIfFix> {
if (constantValue == null) return emptyList()
val fixes = mutableListOf<ConstantConditionIfFix>() val fixes = mutableListOf<ConstantConditionIfFix>()
if (expression.branch(constantValue) != null) { if (expression.branch(constantValue) != null) {
val keepBraces = expression.isElseIf() && expression.branch(constantValue) is KtBlockExpression val keepBraces = expression.isElseIf() && expression.branch(constantValue) is KtBlockExpression
fixes += SimplifyFix(constantValue, expression.isUsedAsExpression(context), keepBraces) fixes += SimplifyFix(
constantValue,
expression.isUsedAsExpression(expression.analyze(BodyResolveMode.PARTIAL_WITH_CFA)),
keepBraces
)
} }
if (!constantValue && expression.`else` == null) { if (!constantValue && expression.`else` == null) {
fixes += RemoveFix() fixes += RemoveFix()
} }
holder?.registerProblem(
condition,
"Condition is always '$constantValue'",
*fixes.toTypedArray()
)
return fixes return fixes
} }
fun applyFixIfSingle(ifExpression: KtIfExpression) { fun applyFixIfSingle(ifExpression: KtIfExpression) {
collectFixesAndRegisterProblem(ifExpression, null).singleOrNull()?.applyFix(ifExpression) collectFixes(ifExpression).singleOrNull()?.applyFix(ifExpression)
} }
} }