From 6e229af4004e7b3abb1b676c37c2672fe6cac183 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Thu, 28 Nov 2013 15:44:58 +0400
Subject: [PATCH] Disable getting variants from kotlin references

---
 idea/src/META-INF/plugin.xml                          |  3 +--
 .../plugin/completion/JetCompletionContributor.java   |  3 ---
 .../jet/plugin/references/JetSimpleNameReference.java | 11 -----------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3350695ee65..8d57176f284 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -210,8 +210,7 @@
 
     <lookup.charFilter implementation="org.jetbrains.jet.plugin.completion.JetCompletionCharFilter"/>
 
-    <psi.referenceContributor language="jet" order="after JetCompletionContributor"
-                              implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
+    <psi.referenceContributor language="jet" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
 
     <renamePsiElementProcessor id="KotlinClass"
                                implementation="org.jetbrains.jet.plugin.refactoring.rename.RenameJetClassProcessor"
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
index b3ef9429044..e619a654d0a 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
@@ -71,9 +71,6 @@ public class JetCompletionContributor extends CompletionContributor {
                 else {
                     session.completeSmart();
                 }
-
-                // Prevent from adding reference variants from standard reference contributor
-                result.stopHere();
             }
             catch (ProcessCanceledException e) {
                 throw CompletionProgressIndicatorUtil.rethrowWithCancelIndicator(e);
diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
index 3d4521f64df..16974bb81e1 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
@@ -53,17 +53,6 @@ public class JetSimpleNameReference extends JetPsiReference {
         return new TextRange(0, getElement().getTextLength());
     }
 
-    @NotNull
-    @Override
-    public Object[] getVariants() {
-        CancelableResolveSession resolveSession =
-                AnalyzerFacadeWithCache.getLazyResolveSessionForFile((JetFile) getExpression().getContainingFile());
-        BindingContext bindingContext = resolveSession.resolveToElement(getExpression());
-
-        return DescriptorLookupConverter.collectLookupElements(
-                resolveSession, bindingContext, TipsManager.getReferenceVariants(myExpression, bindingContext));
-    }
-
     @Override
     public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
         IElementType type = myExpression.getReferencedNameElementType();