From b03a297ed062a0b8640543fb8e6471a40a44c32e Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 2 Oct 2015 19:22:55 +0300
Subject: [PATCH] KT-9326 IDE tries to resolve name in qualified `this` to any
 class in project/classpath

 #KT-9326 Fixed
---
 .../jetbrains/kotlin/idea/util/CallType.kt    | 54 ++++++++++++-------
 .../kotlin/idea/quickfix/AutoImportFix.kt     | 14 ++---
 .../quickfix/autoImports/notForThisLabel.kt   |  6 +++
 .../idea/quickfix/QuickFixTestGenerated.java  |  6 +++
 4 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 idea/testData/quickfix/autoImports/notForThisLabel.kt

diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
index fcb21165dea..0186c971416 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
@@ -121,30 +121,48 @@ public sealed class CallTypeAndReceiver<TReceiver : JetElement?, TCallType : Cal
                 return CallTypeAndReceiver.TYPE(receiverExpression)
             }
 
-            if (receiverExpression == null) {
-                return CallTypeAndReceiver.DEFAULT
-            }
+            when (expression) {
+                is JetOperationReferenceExpression -> {
+                    if (receiverExpression == null) {
+                        return UNKNOWN // incomplete code
+                    }
+                    return when (parent) {
+                        is JetBinaryExpression -> {
+                            //TODO: operator vs infix
+                            CallTypeAndReceiver.INFIX(receiverExpression)
+                        }
 
-            return when (parent) {
-                is JetBinaryExpression -> CallTypeAndReceiver.INFIX(receiverExpression)
+                        is JetUnaryExpression -> CallTypeAndReceiver.UNARY(receiverExpression)
 
-                is JetCallExpression -> {
-                    if ((parent.parent as JetQualifiedExpression).operationSign == JetTokens.SAFE_ACCESS)
-                        CallTypeAndReceiver.SAFE(receiverExpression)
-                    else
-                        CallTypeAndReceiver.DOT(receiverExpression)
+                        else -> error("Unknown parent for JetOperationReferenceExpression: $parent")
+                    }
                 }
 
-                is JetQualifiedExpression -> {
-                    if (parent.operationSign == JetTokens.SAFE_ACCESS)
-                        CallTypeAndReceiver.SAFE(receiverExpression)
-                    else
-                        CallTypeAndReceiver.DOT(receiverExpression)
+                is JetNameReferenceExpression -> {
+                    if (receiverExpression == null) {
+                        return CallTypeAndReceiver.DEFAULT
+                    }
+
+                    return when (parent) {
+                        is JetCallExpression -> {
+                            if ((parent.parent as JetQualifiedExpression).operationSign == JetTokens.SAFE_ACCESS)
+                                CallTypeAndReceiver.SAFE(receiverExpression)
+                            else
+                                CallTypeAndReceiver.DOT(receiverExpression)
+                        }
+
+                        is JetQualifiedExpression -> {
+                            if (parent.operationSign == JetTokens.SAFE_ACCESS)
+                                CallTypeAndReceiver.SAFE(receiverExpression)
+                            else
+                                CallTypeAndReceiver.DOT(receiverExpression)
+                        }
+
+                        else -> error("Unknown parent for JetNameReferenceExpression with receiver: $parent")
+                    }
                 }
 
-                is JetUnaryExpression -> CallTypeAndReceiver.UNARY(receiverExpression)
-
-                else -> error("Unknown parent for expression with receiver: $parent")
+                else -> return UNKNOWN
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
index e5a5b43913c..0e9d83ce0a5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
 import org.jetbrains.kotlin.idea.core.getResolutionScope
 import org.jetbrains.kotlin.idea.core.isVisible
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil
+import org.jetbrains.kotlin.idea.util.CallType
 import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
 import org.jetbrains.kotlin.psi.JetFile
 import org.jetbrains.kotlin.psi.JetPsiUtil
@@ -116,9 +117,12 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
         private val ERRORS = setOf(Errors.UNRESOLVED_REFERENCE, Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER)
 
         public fun computeSuggestions(element: JetSimpleNameExpression): Collection<DeclarationDescriptor> {
-            if (!element.isValid()) return listOf()
+            if (!element.isValid()) return emptyList()
 
-            val file = element.getContainingFile() as? JetFile ?: return listOf()
+            val file = element.getContainingFile() as? JetFile ?: return emptyList()
+
+            val callType = CallTypeAndReceiver.detect(element).callType
+            if (callType is CallType.UNKNOWN) return emptyList()
 
             var referenceName = element.getReferencedName()
             if (element.getIdentifier() == null) {
@@ -127,20 +131,18 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
                     referenceName = conventionName.asString()
                 }
             }
-            if (referenceName.isEmpty()) return listOf()
+            if (referenceName.isEmpty()) return emptyList()
 
             val searchScope = getResolveScope(file)
 
             val bindingContext = element.analyze(BodyResolveMode.PARTIAL)
 
             val diagnostics = bindingContext.getDiagnostics().forElement(element)
-            if (!diagnostics.any { it.getFactory() in ERRORS }) return listOf()
+            if (!diagnostics.any { it.getFactory() in ERRORS }) return emptyList()
 
             val resolutionScope = element.getResolutionScope(bindingContext, file.getResolutionFacade())
             val containingDescriptor = resolutionScope.ownerDescriptor
 
-            val callType = CallTypeAndReceiver.detect(element).callType
-
             fun isVisible(descriptor: DeclarationDescriptor): Boolean {
                 if (!callType.descriptorKindFilter.accepts(descriptor)) return false
 
diff --git a/idea/testData/quickfix/autoImports/notForThisLabel.kt b/idea/testData/quickfix/autoImports/notForThisLabel.kt
new file mode 100644
index 00000000000..b8183146e50
--- /dev/null
+++ b/idea/testData/quickfix/autoImports/notForThisLabel.kt
@@ -0,0 +1,6 @@
+// "class org.jetbrains.kotlin.idea.quickfix.AutoImportFix" "false"
+// ERROR: Unresolved reference: @String
+
+fun refer() {
+    val v1 = this@String<caret>
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 72445d0b265..1e2b1fc220e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -478,6 +478,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             doTest(fileName);
         }
 
+        @TestMetadata("notForThisLabel.kt")
+        public void testNotForThisLabel() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/notForThisLabel.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("sAMConstructorFromLambda.kt")
         public void testSAMConstructorFromLambda() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/sAMConstructorFromLambda.kt");