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

Rewritten ReplaceInfixCallFix

Browse Source 
#EA-70093 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-08-14 18:52:08 +03:00
parent 81acf72d0b
commit 469c5a24de
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+2 -2
View File
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClas
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromReferenceExpressionActionFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromTypeReferenceActionFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateLocalVariableActionFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByRefActionFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByNamedArgumentActionFactory
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByRefActionFactory
import org.jetbrains.kotlin.lexer.JetTokens.*
import org.jetbrains.kotlin.psi.JetClass
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.DEPRECATED_ANNOTATION_METHOD_CALL
@@ -167,7 +167,7 @@ public class QuickFixRegistrar : QuickFixContributor {
UNSAFE_CALL.registerFactory(AddExclExclCallFix)
UNNECESSARY_NOT_NULL_ASSERTION.registerFactory(RemoveExclExclCallFix)
UNSAFE_INFIX_CALL.registerFactory(ReplaceInfixCallFix.createFactory())
UNSAFE_INFIX_CALL.registerFactory(ReplaceInfixCallFix)
PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE.registerActions(SpecifyTypeExplicitlyFix())
AMBIGUOUS_ANONYMOUS_TYPE_INFERRED.registerActions(SpecifyTypeExplicitlyFix())
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt
+10 -16
View File
@@ -20,10 +20,11 @@ import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
import org.jetbrains.kotlin.psi.JetBinaryExpression
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.createExpressionByPattern
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
public class ReplaceInfixCallFix(element: JetBinaryExpression) : JetIntentionAction<JetBinaryExpression>(element) {
@@ -32,25 +33,18 @@ public class ReplaceInfixCallFix(element: JetBinaryExpression) : JetIntentionAct
override fun getFamilyName() = text
override fun invoke(project: Project, editor: Editor?, file: JetFile) {
val left = element.getLeft()
val right = element.getRight()
assert(left != null && right != null, "Preconditions checked by factory")
val newText = left!!.getText() + "?." + element.getOperationReference().getText() + "(" + right!!.getText() + ")"
element.replace(JetPsiFactory(file).createExpression(newText))
val newExpression = JetPsiFactory(file).createExpressionByPattern(
"$0?.$1($2)", element.left!!, element.operationReference, element.right!!)
element.replace(newExpression)
}
override fun startInWriteAction() = true
companion object {
public fun createFactory(): JetSingleIntentionActionFactory {
return object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val expression = QuickFixUtil.getParentElementOfType<JetBinaryExpression>(diagnostic, javaClass<JetBinaryExpression>()) ?: return null
if (expression.getLeft() == null) return null
if (expression.getRight() == null) return null
return ReplaceInfixCallFix(expression)
}
}
companion object : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val expression = diagnostic.psiElement.getNonStrictParentOfType<JetBinaryExpression>()!!
if (expression.left == null || expression.right == null) return null
return ReplaceInfixCallFix(expression)
}
}
}