From 66ea544a48a294712730ccc96c40164fd9a3db49 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 19 Oct 2015 14:39:54 +0300
Subject: [PATCH] Fixed incorrect handling of this and super expressions in
 copy/paste processing and optimize imports

---
 .../KotlinCopyPasteReferenceProcessor.kt      |  6 +++---
 .../idea/imports/KotlinImportOptimizer.kt     |  1 +
 .../ThisAndSuper.dependency.kt                |  3 +++
 .../editor/optimizeImports/ThisAndSuper.kt    | 19 +++++++++++++++++++
 .../optimizeImports/ThisAndSuper.kt.after     | 17 +++++++++++++++++
 .../imports/OptimizeImportsTestGenerated.java |  6 ++++++
 6 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 idea/testData/editor/optimizeImports/ThisAndSuper.dependency.kt
 create mode 100644 idea/testData/editor/optimizeImports/ThisAndSuper.kt
 create mode 100644 idea/testData/editor/optimizeImports/ThisAndSuper.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
index bdb7199a4b5..a26ac078add 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt
@@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.references.JetMultiReference
 import org.jetbrains.kotlin.idea.references.JetReference
 import org.jetbrains.kotlin.idea.references.JetSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
+import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
@@ -53,7 +54,6 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.elementsInRange
 import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
-import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
@@ -156,8 +156,8 @@ public class KotlinCopyPasteReferenceProcessor() : CopyPastePostProcessor<Kotlin
 
                 if (!descriptor.isExtension) {
                     if (element !is JetNameReferenceExpression) continue
-                    if (element.getIdentifier() == null) continue // skip 'this' etc
-                    if (element.getReceiverExpression() != null) continue
+                    if (CallTypeAndReceiver.detect(element).receiver != null) continue
+                    if (element.parent is JetThisExpression || element.parent is JetSuperExpression) continue // TODO: it's a bad design of PSI tree, we should change it
                 }
 
                 val fqName = descriptor.importableFqName ?: continue
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index b91c9753b78..8bc37c24b47 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -106,6 +106,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                     if (!target.isExtension) { // for non-extension targets, count only non-qualified simple name usages
                         if (element !is JetNameReferenceExpression) continue
                         if (CallTypeAndReceiver.detect(element).receiver != null) continue
+                        if (element.parent is JetThisExpression || element.parent is JetSuperExpression) continue // TODO: it's a bad design of PSI tree, we should change it
                     }
 
                     val importableDescriptor = target.getImportableDescriptor()
diff --git a/idea/testData/editor/optimizeImports/ThisAndSuper.dependency.kt b/idea/testData/editor/optimizeImports/ThisAndSuper.dependency.kt
new file mode 100644
index 00000000000..f33294272d0
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ThisAndSuper.dependency.kt
@@ -0,0 +1,3 @@
+package b
+
+open class `super`
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/ThisAndSuper.kt b/idea/testData/editor/optimizeImports/ThisAndSuper.kt
new file mode 100644
index 00000000000..977651039b5
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ThisAndSuper.kt
@@ -0,0 +1,19 @@
+package a
+
+import java.util.ArrayList
+
+class A : b.`super`() {
+    fun f() {
+        this.f()
+    }
+
+    override fun getUsableSpace(): Long {
+        return super.getUsableSpace()
+    }
+
+    companion object {
+        fun g() {
+            this.g()
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/ThisAndSuper.kt.after b/idea/testData/editor/optimizeImports/ThisAndSuper.kt.after
new file mode 100644
index 00000000000..f63e9ec8e80
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/ThisAndSuper.kt.after
@@ -0,0 +1,17 @@
+package a
+
+class A : b.`super`() {
+    fun f() {
+        this.f()
+    }
+
+    override fun getUsableSpace(): Long {
+        return super.getUsableSpace()
+    }
+
+    companion object {
+        fun g() {
+            this.g()
+        }
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
index 3ad0cc73a87..fe11270500c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
@@ -209,6 +209,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("ThisAndSuper.kt")
+    public void testThisAndSuper() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ThisAndSuper.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("UnusedImports.kt")
     public void testUnusedImports() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports.kt");