Replace "contains" with "in" intention handles negation

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) {
+            val previousElement = JetPsiUtil.skipSiblingsBackwardByPredicate(expression) {
-                // I checked, it can't be null.
+                it.getNode().getElementType() in JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET
-                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))
     }
 }

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
+}

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
+}

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");