Moved method getSmartCastVariantsWithLessSpecificExcluded() into IDE

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.kt

@@ -55,18 +55,6 @@ class SmartCastManager {
         return result
     }
 
-    fun getSmartCastVariantsWithLessSpecificExcluded(
-            receiverToCast: ReceiverValue,
-            bindingContext: BindingContext,
-            containingDeclarationOrModule: DeclarationDescriptor,
-            dataFlowInfo: DataFlowInfo
-    ): List<KotlinType> {
-        val variants = getSmartCastVariants(receiverToCast, bindingContext, containingDeclarationOrModule, dataFlowInfo).distinct()
-        return variants.filter { type ->
-            variants.none { another -> another !== type && KotlinTypeChecker.DEFAULT.isSubtypeOf(another, type) }
-        }
-    }
-
     /**
      * @return variants @param receiverToCast may be cast to according to context dataFlowInfo, receiverToCast itself is NOT included
      */

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

@@ -16,8 +16,15 @@
 
 package org.jetbrains.kotlin.idea.util
 
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
+import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastManager
+import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 
 fun KtFunctionLiteral.findLabelAndCall(): Pair<Name?, KtCallExpression?> {
     val literalParent = (this.parent as KtLambdaExpression).parent
@@ -44,3 +51,15 @@ fun KtFunctionLiteral.findLabelAndCall(): Pair<Name?, KtCallExpression?> {
         }
     }
 }
+
+fun SmartCastManager.getSmartCastVariantsWithLessSpecificExcluded(
+        receiverToCast: ReceiverValue,
+        bindingContext: BindingContext,
+        containingDeclarationOrModule: DeclarationDescriptor,
+        dataFlowInfo: DataFlowInfo
+): List<KotlinType> {
+    val variants = getSmartCastVariants(receiverToCast, bindingContext, containingDeclarationOrModule, dataFlowInfo).distinct()
+    return variants.filter { type ->
+        variants.none { another -> another !== type && KotlinTypeChecker.DEFAULT.isSubtypeOf(another, type) }
+    }
+}

idea/idea-completion/testData/basic/multifile/KT12124/KT12124.dependency.java

@@ -0,0 +1,11 @@
+class X {
+    void f(){}
+}
+
+class JavaClass {
+    public void setFoo(X value) {
+    }
+    public X getFoo() {
+        return new X();
+    }
+}

idea/idea-completion/testData/basic/multifile/KT12124/KT12124.java

@@ -1,7 +0,0 @@
-class JavaClass {
-    public void setFoo(String value) {
-    }
-    public String getFoo() {
-        return "";
-    }
-}

idea/idea-completion/testData/basic/multifile/KT12124/KT12124.kt

@@ -1,7 +1,8 @@
+inline fun <T> T.apply(block: T.() -> Unit): T { block(); return this }
+
 val v = JavaClass().apply {
-    foo = ""
+    foo = X()
     foo.<caret>
 }
 
-// EXIST: length
+// EXIST: f
-// EXIST: substring