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

IDEA plugin: fixed using SimplifyNegatedBinaryExpressionIntention and dependent tests.

Browse Source 
+ minor reformat.
This commit is contained in:
Zalim Bashorov
2014-04-16 18:14:11 +04:00
parent 9cff3ba049
commit 361c81bbe5
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt
+33 -30
View File
@@ -22,15 +22,12 @@ import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContext
import org.jetbrains.jet.lang.psi.JetPsiFactory import org.jetbrains.jet.lang.psi.JetPsiFactory
import org.jetbrains.jet.lang.psi.JetPrefixExpression import org.jetbrains.jet.lang.psi.JetPrefixExpression
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression
import org.jetbrains.jet.lang.psi.JetBinaryExpression
import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression import org.jetbrains.jet.lang.psi.JetCallableReferenceExpression
import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import kotlin.properties.Delegates import kotlin.properties.Delegates
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lang.psi.JetIfExpression
public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<JetCallExpression>( public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<JetCallExpression>(
"convert.assert.to.if.with.throw", javaClass()) { "convert.assert.to.if.with.throw", javaClass()) {
@@ -63,38 +60,44 @@ public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<Jet
val condition = args[0]?.getArgumentExpression() val condition = args[0]?.getArgumentExpression()
val lambdas = element.getFunctionLiteralArguments() val lambdas = element.getFunctionLiteralArguments()
val messageExpr: JetExpression? val messageExpr =
if (args.size == 2) { if (args.size == 2) {
messageExpr = args[1]?.getArgumentExpression() args[1]?.getArgumentExpression()
} else if (lambdas.isNotEmpty()) { }
messageExpr = element.getFunctionLiteralArguments()[0] else if (lambdas.isNotEmpty()) {
} else { element.getFunctionLiteralArguments()[0]
messageExpr = JetPsiFactory.createExpression(element.getProject(), "\"Assertion failed\"") }
} else {
JetPsiFactory.createExpression(element.getProject(), "\"Assertion failed\"")
}
if (condition == null || messageExpr == null) return if (condition == null || messageExpr == null) return
val message: String val message =
if (messageIsAFunction && messageExpr is JetCallableReferenceExpression) { if (messageIsAFunction && messageExpr is JetCallableReferenceExpression) {
message = "${messageExpr.getCallableReference().getText()}()" "${messageExpr.getCallableReference().getText()}()"
} else if (messageIsAFunction) { }
message = "${messageExpr.getText()}()" else if (messageIsAFunction) {
} else { "${messageExpr.getText()}()"
message = "${messageExpr.getText()}" }
} else {
"${messageExpr.getText()}"
val negatedCondition = JetPsiFactory.createExpression(element.getProject(), "!true") as JetPrefixExpression }
negatedCondition.getBaseExpression()?.replace(condition)
val simplifier = SimplifyNegatedBinaryExpressionIntention()
if (simplifier.isApplicableTo(negatedCondition)) {
simplifier.applyTo(negatedCondition, editor)
}
val assertTypeRef = JetPsiFactory.createType(element.getProject(), "java.lang.AssertionError") val assertTypeRef = JetPsiFactory.createType(element.getProject(), "java.lang.AssertionError")
ShortenReferences.process(assertTypeRef) ShortenReferences.process(assertTypeRef)
val text = "if (${negatedCondition.getText()}) { throw ${assertTypeRef.getText()}(${message}) }" val text = "if (!true) { throw ${assertTypeRef.getText()}(${message}) }"
element.replace(JetPsiFactory.createExpression(element.getProject(), text)) val ifExpression = JetPsiFactory.createExpression(element.getProject(), text) as JetIfExpression
val ifCondition = ifExpression.getCondition() as JetPrefixExpression
ifCondition.getBaseExpression()?.replace(condition)
val simplifier = SimplifyNegatedBinaryExpressionIntention()
if (simplifier.isApplicableTo(ifCondition)) {
simplifier.applyTo(ifCondition, editor)
}
element.replace(ifExpression)
} }
} }