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

KT-4868 Bug Fix for Swap Binary Expression Intention

Browse Source
This commit is contained in:
Lingzhang
2014-04-21 22:14:26 -04:00
committed by Andrey Breslav
parent 7e66d67b95
commit acf1dc1912
14 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt
+14 -5
View File
@@ -21,6 +21,7 @@ import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.plugin.intentions.SwapBinaryExpression.Position.*
import org.jetbrains.jet.plugin.util.JetPsiPrecedences
public class SwapBinaryExpression : JetSelfTargetingIntention<JetBinaryExpression>(
"swap.binary.expression", javaClass()
@@ -35,16 +36,24 @@ public class SwapBinaryExpression : JetSelfTargetingIntention<JetBinaryExpressio
fun getInnermostOperand(element: JetBinaryExpression, position: Position): JetExpression? {
val left = element.getLeft()
val right = element.getRight()
if (left == null || right == null) {
return null
}
val parentPrecedence = JetPsiPrecedences.getPrecedence(element)
val leftPrecedence = JetPsiPrecedences.getPrecedence(left)
val rightPrecedence = JetPsiPrecedences.getPrecedence(right)
return when (position) {
FIRST_LEFT -> if (left is JetBinaryExpression) getInnermostOperand(left, NEXT_RIGHT) else left as JetExpression
FIRST_RIGHT -> if (right is JetBinaryExpression) getInnermostOperand(right, NEXT_LEFT) else right as JetExpression
NEXT_LEFT -> if (left is JetBinaryExpression) getInnermostOperand(left, NEXT_LEFT) else left as JetExpression
NEXT_RIGHT -> if (right is JetBinaryExpression) getInnermostOperand(right, NEXT_RIGHT) else right as JetExpression
FIRST_LEFT -> if (leftPrecedence < parentPrecedence) left
else if (left is JetBinaryExpression) getInnermostOperand(left, NEXT_RIGHT)
else left as JetExpression
FIRST_RIGHT -> if (rightPrecedence < parentPrecedence) right
else if (right is JetBinaryExpression) getInnermostOperand(right, NEXT_LEFT)
else right as JetExpression
NEXT_LEFT -> if (leftPrecedence < parentPrecedence || left !is JetBinaryExpression) left
else getInnermostOperand(left, NEXT_LEFT)
NEXT_RIGHT -> if (rightPrecedence < parentPrecedence || right !is JetBinaryExpression) right
else getInnermostOperand(right, NEXT_RIGHT)
}
}