From bba960f1a583b1607abe12e8c358a6bc99ef12f4 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 10 Nov 2015 13:35:51 +0300
Subject: [PATCH] Moved enum to top level

---
 .../kotlin/idea/util/ImportInsertHelper.kt          | 13 +++++++------
 .../jetbrains/kotlin/idea/util/ShortenReferences.kt |  4 ++--
 .../kotlin/idea/completion/CompletionUtils.kt       |  2 +-
 .../idea/intentions/ImportAllMembersIntention.kt    |  3 ++-
 .../kotlin/idea/intentions/ImportMemberIntention.kt |  3 ++-
 .../kotlin/idea/util/ImportInsertHelperImpl.kt      |  1 +
 .../kotlin/addImport/AbstractAddImportTest.kt       |  3 ++-
 7 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
index 4a86f802837..47b3fab2c3d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
@@ -31,12 +31,6 @@ abstract class ImportInsertHelper {
 
     abstract val importSortComparator: Comparator<ImportPath>
 
-    enum class ImportDescriptorResult {
-        FAIL,
-        IMPORT_ADDED,
-        ALREADY_IMPORTED
-    }
-
     abstract fun importDescriptor(file: KtFile, descriptor: DeclarationDescriptor, forceAllUnderImport: Boolean = false): ImportDescriptorResult
 
     companion object {
@@ -45,3 +39,10 @@ abstract class ImportInsertHelper {
             = ServiceManager.getService<ImportInsertHelper>(project, javaClass<ImportInsertHelper>())
     }
 }
+
+enum class ImportDescriptorResult {
+    FAIL,
+    IMPORT_ADDED,
+    ALREADY_IMPORTED
+}
+
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
index 703655fe2b0..604832d64b4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
@@ -160,10 +160,10 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
                 assert(descriptor !in failedToImportDescriptors)
 
                 val result = helper.importDescriptor(file, descriptor)
-                if (result != ImportInsertHelper.ImportDescriptorResult.ALREADY_IMPORTED) {
+                if (result != ImportDescriptorResult.ALREADY_IMPORTED) {
                     anyChange = true
                 }
-                if (result == ImportInsertHelper.ImportDescriptorResult.FAIL) {
+                if (result == ImportDescriptorResult.FAIL) {
                     failedToImportDescriptors.add(descriptor)
                 }
             }
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
index ee92b3a6334..8227ba0a6a4 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
@@ -399,7 +399,7 @@ fun LookupElement.decorateAsStaticMember(
             var insertQualifier = true
             if (useImport) {
                 psiDocumentManager.commitAllDocuments()
-                if (ImportInsertHelper.getInstance(context.project).importDescriptor(file, memberDescriptor) != ImportInsertHelper.ImportDescriptorResult.FAIL) {
+                if (ImportInsertHelper.getInstance(context.project).importDescriptor(file, memberDescriptor) != ImportDescriptorResult.FAIL) {
                     insertQualifier = false
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
index bf219d62f4d..8be0fb21eb3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportAllMembersIntention.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.conversion.copy.range
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.ShortenReferences
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
@@ -49,7 +50,7 @@ class ImportAllMembersIntention : SelfTargetingIntention<KtDotQualifiedExpressio
         val dummyFileText = (file.packageDirective?.text ?: "") + "\n" + (file.importList?.text ?: "")
         val dummyFile = KtPsiFactory(project).createAnalyzableFile("Dummy.kt", dummyFileText, file)
         val helper = ImportInsertHelper.getInstance(project)
-        if (helper.importDescriptor(dummyFile, target, forceAllUnderImport = true) == ImportInsertHelper.ImportDescriptorResult.FAIL) return false
+        if (helper.importDescriptor(dummyFile, target, forceAllUnderImport = true) == ImportDescriptorResult.FAIL) return false
 
         text = "Import members from '${targetFqName.parent().asString()}'"
         return true
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
index a6c4d2e09c2..89da992b51b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImportMemberIntention.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.ShortenReferences
 import org.jetbrains.kotlin.name.FqName
@@ -52,7 +53,7 @@ class ImportMemberIntention : SelfTargetingOffsetIndependentIntention<KtNameRefe
 
         val file = element.getContainingKtFile()
         val helper = ImportInsertHelper.getInstance(element.project)
-        if (helper.importDescriptor(file, targets.first()) == ImportInsertHelper.ImportDescriptorResult.FAIL) return
+        if (helper.importDescriptor(file, targets.first()) == ImportDescriptorResult.FAIL) return
 
         val qualifiedExpressions = file.collectDescendantsOfType<KtDotQualifiedExpression> { qualifiedExpression ->
             val selector = qualifiedExpression.getQualifiedElementSelector() as? KtNameReferenceExpression
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
index cef5898e600..82b8bb7c7aa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.imports.getImportableTargets
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.project.platform
 import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
+import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.getFileResolutionScope
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt b/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt
index f3c6cdba548..3079875ed11 100644
--- a/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.AbstractImportsTest
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
+import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
@@ -48,7 +49,7 @@ public abstract class AbstractAddImportTest : AbstractImportsTest() {
                 error("Multiple descriptors found:\n    " + descriptors.map { DescriptorRenderer.FQ_NAMES_IN_TYPES.render(it) }.joinToString("\n    "))
 
             else -> {
-                val success = ImportInsertHelper.getInstance(getProject()).importDescriptor(file, descriptors.single()) != ImportInsertHelper.ImportDescriptorResult.FAIL
+                val success = ImportInsertHelper.getInstance(getProject()).importDescriptor(file, descriptors.single()) != ImportDescriptorResult.FAIL
                 if (!success) {
                     val document = PsiDocumentManager.getInstance(getProject()).getDocument(file)!!
                     document.replaceString(0, document.getTextLength(), "Failed to add import")