Checking "infix" modifier in completion and import popup

idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt

@@ -57,9 +57,8 @@ public sealed class CallType<TReceiver : JetElement?>(val descriptorKindFilter:
     object TYPE : CallType<JetExpression?>(DescriptorKindFilter(DescriptorKindFilter.CLASSIFIERS_MASK or DescriptorKindFilter.PACKAGES_MASK))
 
     private object NonInfixExclude : DescriptorKindExclude() {
-        //TODO: check 'infix' modifier
         override fun excludes(descriptor: DeclarationDescriptor) =
-                !(descriptor is SimpleFunctionDescriptor && descriptor.valueParameters.size() == 1)
+                !(descriptor is SimpleFunctionDescriptor && descriptor.isInfix)
 
         override val fullyExcludedDescriptorKinds: Int
             get() = 0

idea/idea-completion/testData/basic/common/AfterIntSeparatedWithComments.kt

@@ -1,4 +1,4 @@
-fun Int.func(s: String): Int{}
+infix fun Int.func(s: String): Int{}
 
 fun test() {
     val floor = "Floor"

idea/idea-completion/testData/basic/common/InfixCall.kt

@@ -1,18 +1,18 @@
 class C {
-    fun foo(){}
+    fun foo(p: Int){}
-    fun bar(p: Int) {}
+    infix fun bar(p: Int) {}
     fun zoo(p1: Int, p2: Int){}
     val prop: Int = 1
 }
 
-fun C.xxx() {}
+fun C.xxx(p: Int) {}
-fun C.yyy(p: Int) {}
+infix fun C.yyy(p: Int) {}
 fun C.zzz(p1: Int, p2: Int) {}
 val C.extensionProp: Int get() = 1
 
-fun <A, B> A.and(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.and(that: B): Pair<A, B> = Pair(this, that)
 
-fun String.ttt(p: Int) {}
+infix fun String.ttt(p: Int) {}
 
 fun f() {
     C() <caret>

idea/idea-completion/testData/basic/common/InfixCallNoSpecialLambdaArgumentItem.kt

@@ -1,6 +1,6 @@
 // checks that no special item "ext1 { String, Int -> ... }" created for infix call
-fun Int.ext1(handler: (String, Int) -> Unit){}
+infix fun Int.ext1(handler: (String, Int) -> Unit){}
-fun Int.ext2(c: Char){}
+infix fun Int.ext2(c: Char){}
 
 fun foo() {
     val pair = 1 ext<caret>

idea/idea-completion/testData/basic/multifile/NoGenericFunDuplication/NoGenericFunDuplication.dependency.kt

@@ -2,4 +2,4 @@ package dependency
 
 class MyPair<A, B>(public val first: A, public val second: B)
 
-public fun <A, B> A.pair(that: B): MyPair<A, B> = MyPair(this, that)
+infix fun <A, B> A.pair(that: B): MyPair<A, B> = MyPair(this, that)

idea/idea-completion/testData/basic/multifile/NotImportedInfixExtension/NotImportedInfixExtension.dependency.kt

@@ -2,8 +2,8 @@ package other
 
 import pack.C
 
-fun C.xxx() {}
+fun C.xxx(p: Int) {}
-fun C.yyy(p: Int) {}
+infix fun C.yyy(p: Int) {}
 fun C.zzz(p1: Int, p2: Int) {}
 val C.extensionProp: Int get() = 1
 

idea/idea-completion/testData/handlers/InfixCall.kt

@@ -1,4 +1,4 @@
-fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
 
 fun foo() {
     val pair = 1 to<caret>

idea/idea-completion/testData/handlers/InfixCall.kt.after

@@ -1,4 +1,4 @@
-fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
 
 fun foo() {
     val pair = 1 to <caret>

idea/idea-completion/testData/handlers/InfixCallOnSpace.kt

@@ -1,4 +1,4 @@
-fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
 
 fun foo() {
     val pair = 1 to<caret>

idea/idea-completion/testData/handlers/InfixCallOnSpace.kt.after

@@ -1,4 +1,4 @@
-fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.to(that: B): Pair<A, B> = Pair(this, that)
 
 fun foo() {
     val pair = 1 to <caret>

idea/idea-completion/testData/handlers/multifile/InfixExtensionCallImport-2.kt

@@ -1,3 +1,3 @@
 package other
 
-fun <A, B> A.makePair(that: B): Pair<A, B> = Pair(this, that)
+infix fun <A, B> A.makePair(that: B): Pair<A, B> = Pair(this, that)

idea/idea-completion/testData/smart/InfixCall.kt

@@ -1,11 +1,11 @@
 class X {
-    fun foo(i: Int) = ""
+    infix fun foo(i: Int) = ""
-    fun bar() = ""
+    fun bar(i: Int) = ""
     val prop: String = ""
 }
 
-fun X.ext1(s: String) = ""
+infix fun X.ext1(s: String) = ""
-fun X.ext2() = ""
+fun X.ext2(p: Int) = ""
 fun X.extProp: String get() = ""
 
 val s: String = X() <caret>

idea/testData/quickfix/autoImports/infixCall.before.Dependency.kt

@@ -1,3 +1,3 @@
 package util
 
-fun h.H.foo(other: h.H) = ""
+infix fun h.H.foo(other: h.H) = ""

idea/testData/quickfix/autoImports/infixCall2.before.Dependency.kt

@@ -0,0 +1,3 @@
+package util
+
+fun h.H.foo(other: h.H) = ""

idea/testData/quickfix/autoImports/infixCall2.before.Main.kt

@@ -0,0 +1,17 @@
+// "Import" "false"
+// ERROR: Unresolved reference: foo
+// ACTION: Create extension function 'foo'
+// ACTION: Create extension property 'foo'
+// ACTION: Create local variable 'foo'
+// ACTION: Create member function 'foo'
+// ACTION: Create member property 'foo'
+// ACTION: Create parameter 'foo'
+// ACTION: Replace infix call with ordinary call
+
+package h
+
+interface H
+
+fun f(h: H) {
+    h <caret>foo h
+}

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java

@@ -149,6 +149,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             doTestWithExtraFile(fileName);
         }
 
+        @TestMetadata("infixCall2.before.Main.kt")
+        public void testInfixCall2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall2.before.Main.kt");
+            doTestWithExtraFile(fileName);
+        }
+
         @TestMetadata("minusOperator.before.Main.kt")
         public void testMinusOperator() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/minusOperator.before.Main.kt");