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

Smaller range for IfThenToDoubleBangIntention

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-11 17:34:54 +03:00
parent 2b77fe2ff1
commit 749416434f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+12 -11
View File
@@ -17,19 +17,19 @@
package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.JetBundle import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
public class IfThenToDoubleBangIntention : JetSelfTargetingOffsetIndependentIntention<JetIfExpression>(javaClass(), "Replace 'if' expression with '!!' expression") { public class IfThenToDoubleBangIntention : JetSelfTargetingRangeIntention<JetIfExpression>(javaClass(), "Replace 'if' expression with '!!' expression") {
override fun isApplicableTo(element: JetIfExpression): Boolean { override fun applicabilityRange(element: JetIfExpression): TextRange? {
val condition = element.getCondition() as? JetBinaryExpression ?: return false val condition = element.getCondition() as? JetBinaryExpression ?: return null
val thenClause = element.getThen() ?: return false val thenClause = element.getThen() ?: return null
val elseClause = element.getElse() val elseClause = element.getElse()
val expression = condition.expressionComparedToNull() ?: return false val expression = condition.expressionComparedToNull() ?: return null
val token = condition.getOperationToken() val token = condition.getOperationToken()
@@ -37,20 +37,20 @@ public class IfThenToDoubleBangIntention : JetSelfTargetingOffsetIndependentInte
val matchingClause: JetExpression? val matchingClause: JetExpression?
when (token) { when (token) {
JetTokens.EQEQ -> { JetTokens.EQEQ -> {
throwExpression = thenClause.unwrapBlock() as? JetThrowExpression ?: return false throwExpression = thenClause.unwrapBlock() as? JetThrowExpression ?: return null
matchingClause = elseClause matchingClause = elseClause
} }
JetTokens.EXCLEQ -> { JetTokens.EXCLEQ -> {
matchingClause = thenClause matchingClause = thenClause
throwExpression = elseClause?.unwrapBlock() as? JetThrowExpression ?: return false throwExpression = elseClause?.unwrapBlock() as? JetThrowExpression ?: return null
} }
else -> throw IllegalStateException() else -> throw IllegalStateException()
} }
val matchesAsStatement = element.isStatement() && (matchingClause?.isNullExpressionOrEmptyBlock() ?: true) val matchesAsStatement = element.isStatement() && (matchingClause?.isNullExpressionOrEmptyBlock() ?: true)
if (!matchesAsStatement && !(matchingClause?.evaluatesTo(expression) ?: false && expression.isStableVariable())) return false if (!matchesAsStatement && !(matchingClause?.evaluatesTo(expression) ?: false && expression.isStableVariable())) return null
var text = "Replace 'if' expression with '!!' expression" var text = "Replace 'if' expression with '!!' expression"
if (!throwExpression.throwsNullPointerExceptionWithNoArguments()) { if (!throwExpression.throwsNullPointerExceptionWithNoArguments()) {
@@ -58,7 +58,8 @@ public class IfThenToDoubleBangIntention : JetSelfTargetingOffsetIndependentInte
} }
setText(text) setText(text)
return true val rParen = element.getRightParenthesis() ?: return null
return TextRange(element.getTextRange().getStartOffset(), rParen.getTextRange().getEndOffset())
} }
override fun applyTo(element: JetIfExpression, editor: Editor) { override fun applyTo(element: JetIfExpression, editor: Editor) {