From cff817d03ba9567346ae82d458af12c5ae190db1 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 26 Aug 2015 18:16:37 +0300
Subject: [PATCH] Moved class

---
 .../idea/completion/LookupElementFactory.kt      | 15 +--------------
 .../jetbrains/kotlin/idea/completion/Weighers.kt |  1 +
 .../core/completion/DeclarationLookupObject.kt   | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
index 998fa83fba1..4e5a97ef95a 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.completion.handlers.*
 import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
+import org.jetbrains.kotlin.idea.core.completion.PackageLookupObject
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.util.fuzzyReturnType
 import org.jetbrains.kotlin.load.java.JvmAbi
@@ -50,20 +51,6 @@ import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import java.util.*
 
-public data class PackageLookupObject(val fqName: FqName) : DeclarationLookupObject {
-    override val psiElement: PsiElement? get() = null
-
-    override val descriptor: DeclarationDescriptor? get() = null
-
-    override val name: Name get() = fqName.shortName()
-
-    override val importableFqName: FqName get() = fqName
-
-    override val isDeprecated: Boolean get() = false
-
-    override fun getIcon(flags: Int) = PlatformIcons.PACKAGE_ICON
-}
-
 public class LookupElementFactory(
         private val resolutionFacade: ResolutionFacade,
         private val receiverTypes: Collection<JetType>,
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
index 08827c12ad8..2a25074dc50 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/Weighers.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.idea.completion.smart.*
 import org.jetbrains.kotlin.idea.core.ImportableFqNameClassifier
 import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
+import org.jetbrains.kotlin.idea.core.completion.PackageLookupObject
 import org.jetbrains.kotlin.idea.util.FuzzyType
 import org.jetbrains.kotlin.types.typeUtil.TypeNullability
 import org.jetbrains.kotlin.types.typeUtil.isBooleanOrNullableBoolean
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/completion/DeclarationLookupObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/completion/DeclarationLookupObject.kt
index d775f073b8f..41aed30a03b 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/completion/DeclarationLookupObject.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/completion/DeclarationLookupObject.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.core.completion
 
 import com.intellij.openapi.util.Iconable
 import com.intellij.psi.PsiElement
+import com.intellij.util.PlatformIcons
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -29,3 +30,18 @@ public interface DeclarationLookupObject : Iconable {
     public val importableFqName: FqName?
     public val isDeprecated: Boolean
 }
+
+public data class PackageLookupObject(val fqName: FqName) : DeclarationLookupObject {
+    override val psiElement: PsiElement? get() = null
+
+    override val descriptor: DeclarationDescriptor? get() = null
+
+    override val name: Name get() = fqName.shortName()
+
+    override val importableFqName: FqName get() = fqName
+
+    override val isDeprecated: Boolean get() = false
+
+    override fun getIcon(flags: Int) = PlatformIcons.PACKAGE_ICON
+}
+