From b1b171fbc5df6d684702c6c9c653c58f7e94a130 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 13 Oct 2016 15:19:06 +0200
Subject: [PATCH] correct way to check if intention is applicable; revert:
 Delete test that is transformed syntax error

---
 .../conventionNameCalls/ReplaceContainsIntention.kt   | 11 ++++++++++-
 .../replaceContains/withoutOperatorModifier.kt        |  9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt

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 f17049dfe53..e2c7d85b7cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.*
 import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
@@ -49,11 +50,19 @@ class ReplaceContainsIntention : SelfTargetingRangeIntention<KtDotQualifiedExpre
 
         val functionDescriptor = getFunctionDescriptor(element) ?: return null
 
-        if (!functionDescriptor.isOperator && !OperatorChecks.check(functionDescriptor).isSuccess) return null
+        if (!functionDescriptor.isOperatorOrCompatible) return null
 
         return element.callExpression!!.calleeExpression!!.textRange
     }
 
+    private val FunctionDescriptor.isOperatorOrCompatible: Boolean
+        get() {
+            if (this is JavaMethodDescriptor) {
+                return OperatorChecks.check(this).isSuccess
+            }
+            return isOperator
+        }
+
     override fun applyTo(element: KtDotQualifiedExpression, editor: Editor?) {
         val argument = element.callExpression!!.valueArguments.single().getArgumentExpression()!!
         val receiver = element.receiverExpression
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt
new file mode 100644
index 00000000000..117aaba4366
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt
@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+
+fun test() {
+    class Test{
+        fun contains(a: Int) : Boolean = true
+    }
+    val test = Test()
+    test.c<caret>ontains(0)
+}
\ No newline at end of file