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

Fix SimplifyBooleanWithConstantsIntention intention to avoid analyzing files created by JetPsiFactory

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-07-20 19:09:34 +04:00
parent 1bc0a9dfd9
commit f44ba60d51
5 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt
+21 -17
View File
@@ -27,6 +27,8 @@ import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import com.intellij.psi.tree.IElementType
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.lang.psi.psiUtil.copied
import org.jetbrains.jet.lang.psi.psiUtil.replaced
public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention<JetBinaryExpression>(
"simplify.boolean.with.constants", javaClass()) {
@@ -54,7 +56,7 @@ public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention<J
override fun applyTo(element: JetBinaryExpression, editor: Editor) {
// we know from isApplicableTo that topParent is not null
val simplified = simplifyBoolean(topParent!!)
val simplified = toSimplifiedExpression(topParent!!)
if (simplified is JetParenthesizedExpression) {
val expr = simplified.getExpression()
if (expr != null) {
@@ -66,7 +68,7 @@ public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention<J
topParent!!.replace(simplified)
}
private fun simplifyBoolean(element: JetExpression) : JetExpression {
private fun toSimplifiedExpression(element: JetExpression): JetExpression {
val psiFactory = JetPsiFactory(element)
if (element.canBeReducedToTrue())
return psiFactory.createExpression("true")
@@ -76,40 +78,38 @@ public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention<J
is JetParenthesizedExpression -> {
val expr = element.getExpression()
if (expr == null) return element
val simplified = simplifyBoolean(expr)
if (expr == simplified) return element
if (simplified is JetBinaryExpression) {
val simpText = simplified.getText()
if (simpText == null) return element
val innerSimplified = toSimplifiedExpression(expr)
if (innerSimplified is JetBinaryExpression) {
val simpText = innerSimplified.getText() ?: return element.copied()
// wrap in new parentheses to keep the user's original format
return psiFactory.createExpression("($simpText)")
}
// if we now have a simpleName, constant, or parenthesized we don't need parentheses
return simplified
return innerSimplified
}
is JetBinaryExpression -> {
val left = element.getLeft()
val right = element.getRight()
val op = element.getOperationToken()
if (left == null || right == null || op == null || (op != JetTokens.ANDAND && op != JetTokens.OROR))
return element
return element.copied()
val simpleLeft = simplifyBoolean(left)
val simpleRight = simplifyBoolean(right)
val simpleLeft = simplifyExpression(left)
val simpleRight = simplifyExpression(right)
if (simpleLeft.canBeReducedToTrue() || simpleLeft.canBeReducedToFalse())
return simplifyBooleanBinaryExpressionWithConstantOperand(simpleLeft, simpleRight, op)
return toSimplifiedBooleanBinaryExpressionWithConstantOperand(simpleLeft, simpleRight, op)
if (simpleRight.canBeReducedToTrue() || simpleRight.canBeReducedToFalse())
return simplifyBooleanBinaryExpressionWithConstantOperand(simpleRight, simpleLeft, op)
return toSimplifiedBooleanBinaryExpressionWithConstantOperand(simpleRight, simpleLeft, op)
val opText = element.getOperationReference().getText()
if (opText == null) return element
if (opText == null) return element.copied()
return psiFactory.createBinaryExpression(simpleLeft, opText, simpleRight)
}
else -> return element
else -> return element.copied()
}
}
private fun simplifyBooleanBinaryExpressionWithConstantOperand(
private fun toSimplifiedBooleanBinaryExpressionWithConstantOperand(
booleanConstantOperand: JetExpression,
otherOperand: JetExpression,
operation: IElementType
@@ -120,7 +120,11 @@ public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention<J
return psiFactory.createExpression("true")
if (booleanConstantOperand.canBeReducedToFalse() && operation == JetTokens.ANDAND)
return psiFactory.createExpression("false")
return simplifyBoolean(otherOperand)
return toSimplifiedExpression(otherOperand)
}
private fun simplifyExpression(element: JetExpression): JetExpression {
return element.replaced(toSimplifiedExpression(element))
}
private fun JetExpression.canBeReducedToBooleanConstant(constant: Boolean?): Boolean {