From addcadeddf16d95fb880fe14d6ec80b2894ffe27 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 12 May 2015 14:13:25 +0300
Subject: [PATCH] Replace "contains" with "in" intention handles negation

---
 .../ReplaceContainsIntention.kt               | 19 ++++++++++++-------
 .../replaceContains/notContains.kt            |  7 +++++++
 .../replaceContains/notContains.kt.after      |  7 +++++++
 .../intentions/IntentionTestGenerated.java    |  6 ++++++
 4 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt
 create mode 100644 idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt.after

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 d99e414ce54..46f84b4bf8a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
@@ -46,19 +46,24 @@ public class ReplaceContainsIntention : JetSelfTargetingRangeIntention<JetDotQua
         val argument = element.callExpression!!.getValueArguments().single().getArgumentExpression()!!
         val receiver = element.getReceiverExpression()
 
-        // Append semicolon to previous statement if needed
         val psiFactory = JetPsiFactory(element)
+
+        val prefixExpression = element.getParent() as? JetPrefixExpression
+        val expression = if (prefixExpression != null && prefixExpression.getOperationToken() == JetTokens.EXCL) {
+            prefixExpression.replace(psiFactory.createExpressionByPattern("$0 !in $1", argument, receiver))
+        }
+        else {
+            element.replace(psiFactory.createExpressionByPattern("$0 in $1", argument, receiver))
+        }
+
+        // Append semicolon to previous statement if needed
         if (argument is JetFunctionLiteralExpression) {
-            val previousElement = JetPsiUtil.skipSiblingsBackwardByPredicate(element) {
-                // I checked, it can't be null.
-                it!!.getNode()?.getElementType() in JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET
+            val previousElement = JetPsiUtil.skipSiblingsBackwardByPredicate(expression) {
+                it.getNode().getElementType() in JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET
             }
             if (previousElement != null && previousElement is JetExpression) {
-                // If the parent is null, something is very wrong.
                 previousElement.getParent()!!.addAfter(psiFactory.createSemicolon(), previousElement)
             }
         }
-
-        element.replace(psiFactory.createExpressionByPattern("$0 in $1", argument, receiver))
     }
 }
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt
new file mode 100644
index 00000000000..5507689758e
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt
@@ -0,0 +1,7 @@
+fun test() {
+    class Test{
+        fun contains(a: Int) : Boolean = true
+    }
+    val test = Test()
+    if (!test.<caret>contains(1)) return
+}
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt.after
new file mode 100644
index 00000000000..59b8e63179f
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt.after
@@ -0,0 +1,7 @@
+fun test() {
+    class Test{
+        fun contains(a: Int) : Boolean = true
+    }
+    val test = Test()
+    if (1 !in test) return
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 06e53ce6143..96aafcd1e98 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -2222,6 +2222,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("notContains.kt")
+            public void testNotContains() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/notContains.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("simpleArgument.kt")
             public void testSimpleArgument() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/simpleArgument.kt");