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

Modified IfThenToElvis to not apply when using '!!' would be better

Browse Source
This commit is contained in:
Zack Grannan
2014-04-07 05:35:23 -07:00
committed by Zalim Bashorov
parent 9f63f7c488
commit e5054a4a54
6 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+11 -2
View File
@@ -29,6 +29,8 @@ import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNotNullExpr
import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace
import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineLeftSideIfApplicableWithPrompt
import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable
import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments
import org.jetbrains.jet.lang.psi.JetThrowExpression
public class IfThenToElvisIntention : JetSelfTargetingIntention<JetIfExpression>("if.then.to.elvis", javaClass()) {
@@ -42,8 +44,15 @@ public class IfThenToElvisIntention : JetSelfTargetingIntention<JetIfExpression>
if (expression == null || !expression.isStableVariable()) return false
return when (condition.getOperationToken()) {
JetTokens.EQEQ -> thenClause.isNotNullExpression() && elseClause.evaluatesTo(expression)
JetTokens.EXCLEQ -> elseClause.isNotNullExpression() && thenClause.evaluatesTo(expression)
JetTokens.EQEQ ->
thenClause.isNotNullExpression() && elseClause.evaluatesTo(expression) &&
!(thenClause is JetThrowExpression && thenClause.throwsNullPointerExceptionWithNoArguments())
JetTokens.EXCLEQ ->
elseClause.isNotNullExpression() && thenClause.evaluatesTo(expression) &&
!(elseClause is JetThrowExpression && elseClause.throwsNullPointerExceptionWithNoArguments())
else -> false
}
}