Code refactoring

idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt

@@ -128,21 +128,7 @@ class SmartCompletion(val expression: JetSimpleNameExpression,
 
             val result = ArrayList<LookupElement>()
             val types = descriptor.fuzzyTypes(smartCastTypes)
-            val classifier = { (expectedInfo: ExpectedInfo) ->
+            val classifier = { (expectedInfo: ExpectedInfo) -> types.classifyExpectedInfo(expectedInfo) }
-                val substitutor = types.stream().map { it.checkIsSubtypeOf(expectedInfo.type) }.firstOrNull()
-                if (substitutor != null) {
-                    ExpectedInfoClassification.matches(substitutor)
-                }
-                else {
-                    val substitutor2 = types.stream().map { it.makeNotNullable().checkIsSubtypeOf(expectedInfo.type) }.firstOrNull()
-                    if (substitutor2 != null) {
-                        ExpectedInfoClassification.matchesIfNotNullable(substitutor2)
-                    }
-                    else {
-                        ExpectedInfoClassification.notMatches
-                    }
-                }
-            }
             result.addLookupElements(descriptor, expectedInfos, classifier) { descriptor ->
                 lookupElementFactory.createLookupElement(descriptor, resolutionFacade, bindingContext, true)
             }

idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt

@@ -110,14 +110,15 @@ class ExpectedInfoClassification private(val substitutor: TypeSubstitutor?, val
     }
 }
 
-fun FuzzyType.classifyExpectedInfo(expectedInfo: ExpectedInfo): ExpectedInfoClassification {
+fun Collection<FuzzyType>.classifyExpectedInfo(expectedInfo: ExpectedInfo): ExpectedInfoClassification {
-    val substitutor = checkIsSubtypeOf(expectedInfo.type)
+    val stream = stream()
+    val substitutor = stream.map { it.checkIsSubtypeOf(expectedInfo.type) }.firstOrNull()
     if (substitutor != null) {
         return ExpectedInfoClassification.matches(substitutor)
     }
 
-    if (isNullable()) {
+    if (stream.any { it.isNullable() }) {
-        val substitutor2 = makeNotNullable().checkIsSubtypeOf(expectedInfo.type)
+        val substitutor2 = stream.map { it.makeNotNullable().checkIsSubtypeOf(expectedInfo.type) }.firstOrNull()
         if (substitutor2 != null) {
             return ExpectedInfoClassification.matchesIfNotNullable(substitutor2)
         }
@@ -126,6 +127,8 @@ fun FuzzyType.classifyExpectedInfo(expectedInfo: ExpectedInfo): ExpectedInfoClas
     return ExpectedInfoClassification.notMatches
 }
 
+fun FuzzyType.classifyExpectedInfo(expectedInfo: ExpectedInfo) = listOf(this).classifyExpectedInfo(expectedInfo)
+
 fun<TDescriptor: DeclarationDescriptor?> MutableCollection<LookupElement>.addLookupElements(
         descriptor: TDescriptor,
         expectedInfos: Collection<ExpectedInfo>,