diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt index 39e6fe53bcf..ac29a5b3d5e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.intentions.* @@ -26,7 +27,7 @@ import org.jetbrains.kotlin.psi.createExpressionByPattern import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.types.expressions.OperatorConventions -public class ReplaceCallWithBinaryOperatorIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace call with binary operator") { +public class ReplaceCallWithBinaryOperatorIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace call with binary operator"), HighPriorityAction { override fun applicabilityRange(element: JetDotQualifiedExpression): TextRange? { val operation = operation(element.calleeName) ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt index a62711cbb82..641f38cc5e7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention @@ -28,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.createExpressionByPattern import org.jetbrains.kotlin.types.expressions.OperatorConventions -public class ReplaceCallWithUnaryOperatorIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace call with unary operator") { +public class ReplaceCallWithUnaryOperatorIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace call with unary operator"), HighPriorityAction { override fun applicabilityRange(element: JetDotQualifiedExpression): TextRange? { val operation = operation(element.calleeName) ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt index cfabe9e22d2..4dbefe6a841 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.intentions.* @@ -25,7 +26,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.types.expressions.OperatorConventions -public class ReplaceContainsIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'contains' call with 'in' operator") { +public class ReplaceContainsIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'contains' call with 'in' operator"), HighPriorityAction { override fun applicabilityRange(element: JetDotQualifiedExpression): TextRange? { if (element.calleeName != OperatorConventions.CONTAINS.asString()) return null diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetIntention.kt index 69a56c30b1e..68f30a2bdf3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetIntention.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection @@ -29,7 +30,7 @@ import org.jetbrains.kotlin.psi.buildExpression public class ExplicitGetInspection : IntentionBasedInspection(ReplaceGetIntention()) -public class ReplaceGetIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'get' call with index operator") { +public class ReplaceGetIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'get' call with index operator"), HighPriorityAction { override fun applicabilityRange(element: JetDotQualifiedExpression): TextRange? { if (element.calleeName != "get") return null val call = element.callExpression ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt index c1818dfa567..a7be413ab78 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls +import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention @@ -24,7 +25,7 @@ import org.jetbrains.kotlin.idea.intentions.calleeName import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions -public class ReplaceInvokeIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'invoke' with direct call") { +public class ReplaceInvokeIntention : JetSelfTargetingRangeIntention(javaClass(), "Replace 'invoke' with direct call"), HighPriorityAction { override fun applicabilityRange(element: JetDotQualifiedExpression): TextRange? { if (element.calleeName != OperatorConventions.INVOKE.asString()) return null return element.callExpression!!.getCalleeExpression()!!.getTextRange()