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

Simplify boolean with constants optimization: use partial analysis

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-04-13 13:22:28 +03:00
parent 90be6235f7
commit c172810d1d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
+3 -2
View File
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getType import org.jetbrains.kotlin.resolve.calls.callUtil.getType
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode.*
import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.kotlin.types.isFlexible
class SimplifyBooleanWithConstantsInspection : IntentionBasedInspection<KtBinaryExpression>(SimplifyBooleanWithConstantsIntention::class) class SimplifyBooleanWithConstantsInspection : IntentionBasedInspection<KtBinaryExpression>(SimplifyBooleanWithConstantsIntention::class)
@@ -154,12 +155,12 @@ class SimplifyBooleanWithConstantsIntention :
private fun simplifyExpression(expression: KtExpression) = expression.replaced(toSimplifiedExpression(expression)) private fun simplifyExpression(expression: KtExpression) = expression.replaced(toSimplifiedExpression(expression))
private fun KtExpression?.hasBooleanType(): Boolean { private fun KtExpression?.hasBooleanType(): Boolean {
val type = this?.getType(this.analyze()) ?: return false val type = this?.getType(this.analyze(PARTIAL)) ?: return false
return KotlinBuiltIns.isBoolean(type) && !type.isFlexible() return KotlinBuiltIns.isBoolean(type) && !type.isFlexible()
} }
private fun KtExpression.canBeReducedToBooleanConstant(constant: Boolean? = null): Boolean { private fun KtExpression.canBeReducedToBooleanConstant(constant: Boolean? = null): Boolean {
return CompileTimeConstantUtils.canBeReducedToBooleanConstant(this, this.analyze(), constant) return CompileTimeConstantUtils.canBeReducedToBooleanConstant(this, this.analyze(PARTIAL), constant)
} }
private fun KtExpression.canBeReducedToTrue() = canBeReducedToBooleanConstant(true) private fun KtExpression.canBeReducedToTrue() = canBeReducedToBooleanConstant(true)