Rename jet -> kotlin in ide-common

org.jetbrains.jet.plugin -> org.jetbrains.kotlin.plugin
2015-01-11 04:04:31 +03:00
parent 64c6055030
commit 64a9585a4d
66 changed files with 122 additions and 146 deletions
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.codeInsight
+package org.jetbrains.kotlin.plugin.codeInsight

 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.psi.*
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
-
 import java.util.*
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
 import org.jetbrains.kotlin.name.Name
@@ -36,9 +35,9 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.plugin.util.CallType
-import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
-import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.plugin.util.CallType
+import org.jetbrains.kotlin.plugin.util.substituteExtensionIfCallable
+import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance

 public class ReferenceVariantsHelper(
        private val context: BindingContext,
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util

 import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
@@ -24,7 +24,6 @@ import java.util.HashSet
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl
 import java.util.LinkedHashMap
 import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintsUtil
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.util;
+package org.jetbrains.kotlin.plugin.util;

 import kotlin.Function1;
-import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;
+import org.jetbrains.kotlin.types.JetType;

 public class IdeDescriptorRenderers {

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,22 +14,14 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util

-import org.jetbrains.kotlin.types.JetType
-import org.jetbrains.kotlin.types.TypeUtils
+import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.types.JetTypeImpl
-import org.jetbrains.kotlin.types.TypeProjectionImpl
-import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.CollectionClassMapping
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
-import org.jetbrains.kotlin.types.isFlexible
-import org.jetbrains.kotlin.types.flexibility
 import java.util.LinkedHashSet
-import org.jetbrains.kotlin.types.isDynamic
-import org.jetbrains.kotlin.types.isNullabilityFlexible

 fun JetType.makeNullable() = TypeUtils.makeNullable(this)
 fun JetType.makeNotNullable() = TypeUtils.makeNotNullable(this)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util

 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
@@ -31,21 +31,23 @@ public enum class CallType {

    INFIX {
        override fun canCall(descriptor: DeclarationDescriptor)
-                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 1
+                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 1
    }

    UNARY {
        override fun canCall(descriptor: DeclarationDescriptor)
-                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size == 0
+                = descriptor is SimpleFunctionDescriptor && descriptor.getValueParameters().size() == 0
    }

    public open fun canCall(descriptor: DeclarationDescriptor): Boolean = true
 }

-public fun CallableDescriptor.substituteExtensionIfCallable(receivers: Collection<ReceiverValue>,
-                                                  context: BindingContext,
-                                                  dataFlowInfo: DataFlowInfo,
-                                                  callType: CallType): Collection<CallableDescriptor> {
+public fun CallableDescriptor.substituteExtensionIfCallable(
+        receivers: Collection<ReceiverValue>,
+        context: BindingContext,
+        dataFlowInfo: DataFlowInfo,
+        callType: CallType
+): Collection<CallableDescriptor> {
    val stream = receivers.stream().flatMap { substituteExtensionIfCallable(it, callType, context, dataFlowInfo).stream() }
    if (getTypeParameters().isEmpty()) { // optimization for non-generic callables
        return stream.firstOrNull()?.let { listOf(it) } ?: listOf()
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package org.jetbrains.jet.plugin.util
+package org.jetbrains.kotlin.plugin.util

 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetDeclarationWithBody
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
-import org.jetbrains.jet.plugin.util.approximateFlexibleTypes
+import org.jetbrains.kotlin.plugin.util.approximateFlexibleTypes
 import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor
 import org.jetbrains.jet.plugin.caches.resolve.analyze

@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import javax.swing.*;
 import java.util.ArrayList;
@@ -33,11 +33,11 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import com.intellij.psi.stubs.StringStubIndexExtension
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
-import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable
-import org.jetbrains.jet.plugin.util.CallType
-import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper
+import org.jetbrains.kotlin.plugin.util.substituteExtensionIfCallable
+import org.jetbrains.kotlin.plugin.util.CallType
+import org.jetbrains.kotlin.plugin.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
-import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance

 public class KotlinIndicesHelper(
        private val project: Project,
@@ -64,7 +64,7 @@ import org.jetbrains.kotlin.utils.*
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 import com.intellij.openapi.progress.ProcessCanceledException
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType

 //NOTE: this class is based on CopyPasteReferenceProcessor and JavaCopyPasteReferenceProcessor
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.quickfix.QuickfixPackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;

@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.jet.plugin.caches.resolve.*
-import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper
+import org.jetbrains.kotlin.plugin.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.jet.plugin.completion.smart.SmartCompletion
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper
@@ -39,8 +39,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import org.jetbrains.jet.plugin.refactoring.comparePossiblyOverridingDescriptors
 import kotlin.properties.Delegates
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
-import org.jetbrains.jet.plugin.util.makeNotNullable
-import org.jetbrains.jet.plugin.util.CallType
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.CallType
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import com.intellij.patterns.StandardPatterns
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import com.intellij.codeInsight.completion.PrefixMatcher
 import org.jetbrains.kotlin.name.Name
 import com.intellij.codeInsight.lookup.LookupElementPresentation
@@ -53,10 +53,10 @@ import org.jetbrains.kotlin.psi.JetValueArgumentList
 import org.jetbrains.kotlin.psi.JetCallExpression
 import org.jetbrains.kotlin.psi.JetExpression
 import java.util.ArrayList
-import org.jetbrains.jet.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.jet.plugin.util.FuzzyType
+import org.jetbrains.kotlin.plugin.util.FuzzyType
 import org.jetbrains.kotlin.psi.JetLabeledExpression
 import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.kotlin.psi.psiUtil.parents
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.psi.JetContainerNode
 import org.jetbrains.kotlin.resolve.calls.callUtil.noErrorsInValueArguments
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.psi.JetBlockExpression
-import org.jetbrains.jet.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
 import org.jetbrains.kotlin.psi.JetWhenConditionWithExpression
 import org.jetbrains.kotlin.psi.JetWhenEntry
 import org.jetbrains.kotlin.psi.JetWhenExpression
@@ -37,8 +37,8 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer
 import org.jetbrains.kotlin.types.TypeUtils
 import com.intellij.codeInsight.lookup.impl.LookupCellRenderer
-import org.jetbrains.jet.plugin.util.nullability
-import org.jetbrains.jet.plugin.util.TypeNullability
+import org.jetbrains.kotlin.plugin.util.nullability
+import org.jetbrains.kotlin.plugin.util.TypeNullability

 public class LookupElementFactory(
        private val receiverTypes: Collection<JetType>
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getCallNameExpression
 import com.intellij.psi.PsiElement
 import com.intellij.codeInsight.completion.InsertHandler
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType

@@ -22,7 +22,7 @@ import com.intellij.patterns.PlatformPatterns
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetPackageDirective
 import org.jetbrains.jet.plugin.caches.resolve.*
-import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper
+import org.jetbrains.kotlin.plugin.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference

 /**
@@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.completion.InsertionContext
 import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers

 open class BaseDeclarationInsertHandler : InsertHandler<LookupElement> {
    override fun handleInsert(context: InsertionContext, item: LookupElement) {
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade
 import org.jetbrains.jet.plugin.util.application.runWriteAction
 import org.jetbrains.jet.plugin.refactoring.EmptyValidator
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode

 fun insertLambdaTemplate(context: InsertionContext, placeholderRange: TextRange, lambdaType: JetType) {
@@ -31,7 +31,7 @@ import org.jetbrains.jet.plugin.JetDescriptorIconProvider
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.jet.plugin.completion.PositionalArgumentExpectedInfo
 import java.util.ArrayList
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.completion.assignPriority
 import com.intellij.codeInsight.lookup.Lookup
 import org.jetbrains.kotlin.types.JetType
@@ -26,15 +26,15 @@ import com.intellij.codeInsight.completion.*
 import java.util.*
 import org.jetbrains.jet.plugin.completion.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.jet.plugin.util.makeNotNullable
-import org.jetbrains.jet.plugin.util.makeNullable
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.makeNullable
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import com.intellij.psi.search.GlobalSearchScope
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
-import org.jetbrains.jet.plugin.util.FuzzyType
-import org.jetbrains.jet.plugin.util.fuzzyReturnType
+import org.jetbrains.kotlin.plugin.util.FuzzyType
+import org.jetbrains.kotlin.plugin.util.fuzzyReturnType
 import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression

@@ -42,15 +42,17 @@ trait InheritanceItemsSearcher {
    fun search(nameFilter: (String) -> Boolean, consumer: (LookupElement) -> Unit)
 }

-class SmartCompletion(val expression: JetExpression,
-                      val resolutionFacade: ResolutionFacade,
-                      val moduleDescriptor: ModuleDescriptor,
-                      val bindingContext: BindingContext,
-                      val visibilityFilter: (DeclarationDescriptor) -> Boolean,
-                      val prefixMatcher: PrefixMatcher,
-                      val inheritorSearchScope: GlobalSearchScope,
-                      val toFromOriginalFileMapper: ToFromOriginalFileMapper,
-                      val lookupElementFactory: LookupElementFactory) {
+class SmartCompletion(
+        val expression: JetExpression,
+        val resolutionFacade: ResolutionFacade,
+        val moduleDescriptor: ModuleDescriptor,
+        val bindingContext: BindingContext,
+        val visibilityFilter: (DeclarationDescriptor) -> Boolean,
+        val prefixMatcher: PrefixMatcher,
+        val inheritorSearchScope: GlobalSearchScope,
+        val toFromOriginalFileMapper: ToFromOriginalFileMapper,
+        val lookupElementFactory: LookupElementFactory
+) {
    private val project = expression.getProject()

    public class Result(
@@ -28,11 +28,11 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.jet.plugin.completion.ExpectedInfo
 import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.jet.plugin.completion.LookupElementFactory
 import org.jetbrains.kotlin.types.TypeSubstitutor
-import org.jetbrains.jet.plugin.util.fuzzyReturnType
+import org.jetbrains.kotlin.plugin.util.fuzzyReturnType
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 import org.jetbrains.jet.plugin.completion.isVisible

@@ -33,8 +33,8 @@ import org.jetbrains.jet.plugin.completion.*
 import org.jetbrains.jet.plugin.completion.handlers.CaretPosition
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.jet.plugin.util.makeNotNullable
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor
@@ -30,7 +30,7 @@ import java.util.HashSet
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
-import org.jetbrains.jet.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.makeNotNullable

 class TypesWithSmartCasts(val bindingContext: BindingContext) {
    public fun calculate(expression: JetExpression, receiver: JetExpression?): (VariableDescriptor) -> Collection<JetType> {
@@ -40,22 +40,22 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
 import org.jetbrains.kotlin.types.TypeSubstitutor
 import java.util.ArrayList
 import java.util.HashMap
-import org.jetbrains.jet.plugin.util.FuzzyType
-import org.jetbrains.jet.plugin.util.makeNotNullable
-import org.jetbrains.jet.plugin.util.nullability
-import org.jetbrains.jet.plugin.util.TypeNullability
+import org.jetbrains.kotlin.plugin.util.FuzzyType
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.nullability
+import org.jetbrains.kotlin.plugin.util.TypeNullability

 class ArtificialElementInsertHandler(
        val textBeforeCaret: String, val textAfterCaret: String, val shortenRefs: Boolean) : InsertHandler<LookupElement>{
    override fun handleInsert(context: InsertionContext, item: LookupElement) {
        val offset = context.getEditor().getCaretModel().getOffset()
-        val startOffset = offset - item.getLookupString().length
+        val startOffset = offset - item.getLookupString().length()
        context.getDocument().deleteString(startOffset, offset) // delete inserted lookup string
        context.getDocument().insertString(startOffset, textBeforeCaret + textAfterCaret)
-        context.getEditor().getCaretModel().moveToOffset(startOffset + textBeforeCaret.length)
+        context.getEditor().getCaretModel().moveToOffset(startOffset + textBeforeCaret.length())

        if (shortenRefs) {
-            shortenReferences(context, startOffset, startOffset + textBeforeCaret.length + textAfterCaret.length)
+            shortenReferences(context, startOffset, startOffset + textBeforeCaret.length() + textAfterCaret.length())
        }
    }
 }
@@ -66,8 +66,8 @@ fun shortenReferences(context: InsertionContext, startOffset: Int, endOffset: In
 }

 fun mergeTails(tails: Collection<Tail?>): Tail? {
-    if (tails.size == 1) return tails.single()
-    return if (HashSet(tails).size == 1) tails.first() else null
+    if (tails.size() == 1) return tails.single()
+    return if (HashSet(tails).size() == 1) tails.first() else null
 }

 fun LookupElement.addTail(tail: Tail?): LookupElement {
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.psi.JetTypeArgumentList
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.analyze

 public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpression>(
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.analyze

 public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention<JetFunctionLiteralExpression>(
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.types.TypeUtils;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences
 import org.jetbrains.jet.JetNodeTypes
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.analyze

 fun specifyTypeExplicitly(declaration: JetNamedFunction, typeText: String) {
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;

@@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter;
 import org.jetbrains.kotlin.resolve.scopes.JetScope;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.UtilPackage;
+import org.jetbrains.kotlin.plugin.util.UtilPackage;
 import org.jetbrains.kotlin.di.InjectorForMacros;

 import java.util.ArrayList;
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper;
+import org.jetbrains.kotlin.plugin.codeInsight.ReferenceVariantsHelper;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;

 import java.awt.*;
@@ -41,7 +41,7 @@ import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.Collections;
 import java.util.Comparator;
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.LinkedList;
 import java.util.List;
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.LinkedList;
 import java.util.List;
@@ -42,7 +42,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
 import org.jetbrains.jet.plugin.refactoring.JetNameValidator;
 import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.List;

@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -28,11 +28,9 @@ import org.jetbrains.kotlin.diagnostics.Errors;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetParameter;
 import org.jetbrains.kotlin.psi.JetTypeReference;
-import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.JetBundle;
-import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;

@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.LinkedList;
 import java.util.List;
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage;
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.util.UtilPackage;
+import org.jetbrains.kotlin.plugin.util.UtilPackage;

 import java.util.Collections;
 import java.util.LinkedList;
@@ -44,8 +44,8 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
-import org.jetbrains.jet.plugin.util.UtilPackage;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.UtilPackage;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;

 import java.util.Collections;
@@ -48,7 +48,6 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.jet.plugin.refactoring.EmptyValidator
 import org.jetbrains.jet.plugin.refactoring.CollectingValidator
-import org.jetbrains.jet.plugin.util.isUnit
 import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.lexer.JetTokens
@@ -62,12 +61,12 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl
 import java.util.LinkedHashMap
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind
-import org.jetbrains.jet.plugin.util.isAny
+import org.jetbrains.kotlin.plugin.util.isAny
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import org.jetbrains.kotlin.psi.psiUtil.siblings
-import org.jetbrains.jet.plugin.refactoring.getLineCount
+import org.jetbrains.kotlin.plugin.util.isUnit

 private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
 private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"
@@ -9,17 +9,13 @@ import com.intellij.util.ArrayUtil
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester
 import org.jetbrains.jet.plugin.refactoring.EmptyValidator
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.plugin.util.supertypes
+import org.jetbrains.kotlin.plugin.util.supertypes
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.psi.JetElement
 import org.jetbrains.kotlin.psi.JetTypeReference
-import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind
 import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassInfo
-import org.jetbrains.jet.plugin.util.makeNotNullable
-import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.types.checker.JetTypeChecker
-import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import org.jetbrains.kotlin.plugin.util.makeNotNullable

 /**
 * Represents a concrete type or a set of types yet to be inferred from an expression.
@@ -31,9 +31,8 @@ import org.jetbrains.kotlin.psi.JetProperty
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils
 import org.jetbrains.kotlin.name.FqName
-import kotlin.properties.Delegates
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.jet.plugin.util.makeNotNullable
+import org.jetbrains.kotlin.plugin.util.makeNotNullable
 import org.jetbrains.kotlin.psi.JetAnnotationEntry
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType

@@ -52,7 +52,7 @@ import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils;
 import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.jet.plugin.util.string.StringPackage;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.asJava.AsJavaPackage;
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.jet.plugin.JetLanguage
 import org.jetbrains.jet.plugin.caches.resolve.*
 import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import java.util.HashMap
 import kotlin.properties.Delegates

@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage
 import org.jetbrains.kotlin.descriptors.ConstructorDescriptor
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers

 public trait JetMethodDescriptor : MethodDescriptor<JetParameterInfo, Visibility> {
    val baseDeclaration: PsiElement
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode
 import com.intellij.refactoring.changeSignature.ParameterInfo
 import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.types.JetType
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure
 import org.jetbrains.kotlin.types.TypeProjectionImpl
 import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage
 import org.jetbrains.kotlin.types.JetType
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.types.Variance

 private fun getTypeSubstitution(baseType: JetType, derivedType: JetType): LinkedHashMap<TypeConstructor, TypeProjection>? {
@@ -41,17 +41,8 @@ import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.psi.JetClassBody
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetNamedDeclaration
-import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.CommonSupertypes
-import org.jetbrains.kotlin.types.TypeSubstitutor
-import org.jetbrains.kotlin.types.JetTypeImpl
-import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import java.util.Collections
-import org.jetbrains.kotlin.types.TypeProjectionImpl
-import org.jetbrains.kotlin.types.Variance
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.types.TypeProjection
-import org.jetbrains.kotlin.types.TypeConstructor
 import org.jetbrains.kotlin.psi.JetExpression
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ExpressionValue
@@ -62,11 +53,10 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils
 import org.jetbrains.kotlin.types.TypeUtils
 import kotlin.properties.Delegates
 import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.kotlin.psi.JetCallElement
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange
 import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.jet.plugin.util.isUnit
+import org.jetbrains.kotlin.plugin.util.isUnit

 trait Parameter {
    val argumentText: String
@@ -64,7 +64,7 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump
 import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverseFollowingInstructions
 import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValueBoxer.AsList
 import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBody
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor
 import org.jetbrains.jet.plugin.caches.resolve.analyze
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -56,7 +56,7 @@ import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match
 import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.WeaklyMatched
 import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.StronglyMatched
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import java.util.ArrayList
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle;
 import org.jetbrains.jet.plugin.refactoring.RefactoringPackage;
 import org.jetbrains.jet.plugin.refactoring.extractFunction.*;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.jet.plugin.refactoring.JetNameSuggester;
 import org.jetbrains.jet.plugin.refactoring.extractFunction.Parameter;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import javax.swing.*;
 import javax.swing.table.AbstractTableModel;
@@ -63,7 +63,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import java.util.List;
 import java.util.Map;
@@ -41,7 +41,7 @@ import org.jetbrains.kotlin.psi.JetTypeReference;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;

 import javax.swing.*;
 import java.awt.*;
@@ -59,7 +59,7 @@ import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
 import org.jetbrains.jet.plugin.refactoring.introduce.KotlinIntroduceHandlerBase;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange;
 import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier;
 import org.jetbrains.jet.plugin.util.psi.patternMatching.PatternMatchingPackage;
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.jet.plugin.JetBundle;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil;
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;

 import javax.swing.*;
@@ -88,7 +88,7 @@ import org.jetbrains.kotlin.psi.JetProperty
 import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass
 import org.jetbrains.kotlin.psi.JetDelegationSpecifier
 import org.jetbrains.jet.plugin.refactoring.getContextForContainingDeclarationBody
-import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.JetOperationReferenceExpression

 public trait UnificationResult {