From 809be9b069ed1b2f723c9242f30215297480173e Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 5 Mar 2014 17:59:57 +0400
Subject: [PATCH] Optimize Imports: do not keep imports of unimportable
 entities

---
 .../KotlinCopyPasteReferenceProcessor.kt      | 15 ---------------
 .../jet/plugin/imports/ImportsUtils.kt        | 19 ++++++++++++++++++-
 .../plugin/imports/KotlinImportOptimizer.kt   |  3 ++-
 .../ClassMemberImported.after.kt              | 10 ++++++++++
 .../ClassMemberImported.dependency.kt         | 15 +++++++++++++++
 .../ClassMemberImported.kt                    | 14 ++++++++++++++
 .../imports/OptimizeImportsTestGenerated.java |  5 +++++
 7 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt
 create mode 100644 idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt
 create mode 100644 idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index de1015c68af..cdb200993ad 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -164,21 +164,6 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Refere
         return collectedData
     }
 
-    private fun DeclarationDescriptor.canBeReferencedViaImport(): Boolean {
-        if (this is PackageViewDescriptor || DescriptorUtils.isTopLevelDeclaration(this)) {
-            return true
-        }
-        val parent = getContainingDeclaration()!!
-        if (parent !is ClassDescriptor || !parent.canBeReferencedViaImport()) {
-            return false
-        }
-        // inner class constructors can't be referenced via import
-        if (this is ConstructorDescriptor && parent.isInner()) {
-            return false
-        }
-        return this is ClassDescriptor || this is ConstructorDescriptor
-    }
-
     private fun createReferenceData(element: PsiElement, startOffset: Int, fqName: FqName): ReferenceData {
         val range = element.range
         return ReferenceData(range.start - startOffset, range.end - startOffset, fqName.asString(), null)
diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt
index 7c3bc1a6097..ff2247aae1e 100644
--- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt
+++ b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt
@@ -20,6 +20,8 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
+import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 
 public val DeclarationDescriptor.importableFqName: FqName?
     get() {
@@ -31,4 +33,19 @@ public val DeclarationDescriptor.importableFqName: FqName?
         else {
             null
         }
-    }
\ No newline at end of file
+    }
+
+public fun DeclarationDescriptor.canBeReferencedViaImport(): Boolean {
+    if (this is PackageViewDescriptor || DescriptorUtils.isTopLevelDeclaration(this)) {
+        return true
+    }
+    val parent = getContainingDeclaration()!!
+    if (parent !is ClassDescriptor || !parent.canBeReferencedViaImport()) {
+        return false
+    }
+    // inner class constructors can't be referenced via import
+    if (this is ConstructorDescriptor && parent.isInner()) {
+        return false
+    }
+    return this is ClassDescriptor || this is ConstructorDescriptor
+}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt
index b82c279f6de..3bfe3c9fc9e 100644
--- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt
@@ -98,7 +98,8 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                 val reference = element.getReference()
                 if (reference is JetReference) {
                     val referencedDescriptors = reference.resolveToDescriptors()
-                    usedQualifiedNames.addAll(referencedDescriptors.map { it.importableFqName }.filterNotNull())
+                    val importableDescriptors = referencedDescriptors.filter { it.canBeReferencedViaImport() }
+                    usedQualifiedNames.addAll(importableDescriptors.map { it.importableFqName }.filterNotNull())
                 }
                 super.visitJetElement(element)
             }
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt
new file mode 100644
index 00000000000..a8ae5b58424
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.after.kt
@@ -0,0 +1,10 @@
+package test
+
+import dependency.*
+
+fun f(a: A, t: T) {
+    a.f()
+    a.p
+    t.f
+    t.p
+}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt
new file mode 100644
index 00000000000..c8ed1576230
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.dependency.kt
@@ -0,0 +1,15 @@
+package dependency
+
+class A {
+    fun f() {
+    }
+
+    val p: Int = 1
+}
+
+trait T {
+    fun f() {
+    }
+
+    val p: Int = 1
+}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt
new file mode 100644
index 00000000000..5e1b3773e6b
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ClassMemberImported/ClassMemberImported.kt
@@ -0,0 +1,14 @@
+package test
+
+import dependency.*
+import dependency.A.f
+import dependency.A.p
+import dependency.T.f
+import dependency.T.p
+
+fun f(a: A, t: T) {
+    a.f()
+    a.p
+    t.f
+    t.p
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
index bf5e181f32f..0ecb24ad83f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
@@ -46,6 +46,11 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest("idea/testData/editor/optimizeImports/ArrayAccessExpression");
     }
     
+    @TestMetadata("ClassMemberImported")
+    public void testClassMemberImported() throws Exception {
+        doTest("idea/testData/editor/optimizeImports/ClassMemberImported");
+    }
+    
     @TestMetadata("ComponentFunction")
     public void testComponentFunction() throws Exception {
         doTest("idea/testData/editor/optimizeImports/ComponentFunction");