From 418b16e7661a13f5dc14092f1446420a212f012a Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 3 Dec 2014 14:35:25 +0300
Subject: [PATCH] Moved FuzzyType and changed package for extensionUtils

---
 .../jet/plugin/codeInsight/ReferenceVariantsHelper.kt         | 3 +--
 .../src/org/jetbrains/jet/plugin/util}/FuzzyType.kt           | 2 +-
 .../src/org/jetbrains/jet/plugin/util/extensionsUtils.kt      | 2 +-
 .../org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt    | 2 +-
 .../jetbrains/jet/plugin/completion/smart/SmartCompletion.kt  | 2 ++
 .../jetbrains/jet/plugin/completion/smart/StaticMembers.kt    | 1 +
 .../org/jetbrains/jet/plugin/completion/smart/ThisItems.kt    | 2 +-
 idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt   | 3 +++
 .../jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java  | 4 ++--
 9 files changed, 13 insertions(+), 8 deletions(-)
 rename idea/{src/org/jetbrains/jet/plugin/completion/smart => ide-common/src/org/jetbrains/jet/plugin/util}/FuzzyType.kt (98%)

diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
index 7316b46d004..cd586757675 100644
--- a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
+++ b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
@@ -36,8 +36,7 @@ import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.TypeUtils
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker
 import org.jetbrains.jet.lexer.JetTokens
-import org.jetbrains.jet.utils.addIfNotNull
-import org.jetbrains.jet.plugin.util.extensionsUtils.substituteExtensionIfCallable
+import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
 
 public class ReferenceVariantsHelper(
         private val context: BindingContext,
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/FuzzyType.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt
similarity index 98%
rename from idea/src/org/jetbrains/jet/plugin/completion/smart/FuzzyType.kt
rename to idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt
index 386655edec2..fe3fd28724e 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/FuzzyType.kt
+++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.completion.smart
+package org.jetbrains.jet.plugin.util
 
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt
index 8b1716f7cb2..fdc1b6e45c8 100644
--- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt
+++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.util.extensionsUtils
+package org.jetbrains.jet.plugin.util
 
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
index 62aea30910a..ef51f49ff9c 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
+++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo
 import com.intellij.psi.stubs.StringStubIndexExtension
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
-import org.jetbrains.jet.plugin.util.extensionsUtils.substituteExtensionIfCallable
+import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
 
 public class KotlinIndicesHelper(
         private val project: Project,
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
index e1d34dbbb2b..e483ddca0e4 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt
@@ -35,6 +35,8 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf
+import org.jetbrains.jet.plugin.util.FuzzyType
+import org.jetbrains.jet.plugin.util.fuzzyReturnType
 
 trait InheritanceItemsSearcher {
     fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit)
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
index 106f1f4fd3d..4997e7c9244 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt
@@ -34,6 +34,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.jet.plugin.completion.LookupElementFactory
 import org.jetbrains.jet.lang.types.TypeSubstitutor
+import org.jetbrains.jet.plugin.util.fuzzyReturnType
 
 // adds java static members, enum members and members from class object
 class StaticMembers(
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
index 9855d337691..4a57b2bd53a 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/ThisItems.kt
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.plugin.completion.ExpectedInfo
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
 import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
+import org.jetbrains.jet.plugin.util.FuzzyType
 
 class ThisItems(val bindingContext: BindingContext) {
     public fun addToCollection(collection: MutableCollection<LookupElement>, context: JetExpression, expectedInfos: Collection<ExpectedInfo>) {
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
index d3e592c284b..f49c061d41f 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
@@ -40,6 +40,9 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.jet.lang.types.TypeSubstitutor
 import java.util.ArrayList
 import java.util.HashMap
+import org.jetbrains.jet.plugin.util.FuzzyType
+import org.jetbrains.jet.plugin.util.isNullable
+import org.jetbrains.jet.plugin.util.makeNotNullable
 
 class ArtificialElementInsertHandler(
         val textBeforeCaret: String, val textAfterCaret: String, val shortenRefs: Boolean) : InsertHandler<LookupElement>{
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
index a2e3b2ddd38..b6b524aaea1 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java
@@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.extensionsUtils.ExtensionsUtilsPackage;
+import org.jetbrains.jet.plugin.util.UtilPackage;
 
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -83,7 +83,7 @@ public abstract class BaseJetVariableMacro extends Macro {
                 VariableDescriptor variableDescriptor = (VariableDescriptor) declarationDescriptor;
 
                 if (variableDescriptor.getExtensionReceiverParameter() != null
-                    && ExtensionsUtilsPackage.substituteExtensionIfCallableWithImplicitReceiver(
+                    && UtilPackage.substituteExtensionIfCallableWithImplicitReceiver(
                         variableDescriptor, scope, bindingContext, dataFlowInfo).isEmpty()) {
                     continue;
                 }