From 18e45f3c27893ff65bfa230c2aecc815b87c2b7c Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Fri, 8 Jun 2012 15:28:11 +0400
Subject: [PATCH] inlined method 'referenceToDescriptor'

---
 .../jet/lang/resolve/BindingContextUtils.java  | 18 +++---------------
 .../StandardLibraryReferenceResolver.java      |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
index 938868bd8ee..bfaec5b35c7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java
@@ -22,8 +22,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
-import org.jetbrains.jet.lang.resolve.calls.VariableAsFunctionResolvedCall;
 import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
 import org.jetbrains.jet.util.slicedmap.Slices;
 
@@ -63,7 +61,7 @@ public class BindingContextUtils {
 
     @Nullable
     public static PsiElement resolveToDeclarationPsiElement(@NotNull BindingContext bindingContext, @Nullable JetReferenceExpression referenceExpression) {
-        DeclarationDescriptor declarationDescriptor = referenceToDescriptor(bindingContext, referenceExpression);
+        DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, referenceExpression);
         if (declarationDescriptor == null) {
             return bindingContext.get(BindingContext.LABEL_TARGET, referenceExpression);
         }
@@ -78,7 +76,7 @@ public class BindingContextUtils {
 
     @NotNull
     public static List<PsiElement> resolveToDeclarationPsiElements(@NotNull BindingContext bindingContext, @Nullable JetReferenceExpression referenceExpression) {
-        DeclarationDescriptor declarationDescriptor = referenceToDescriptor(bindingContext, referenceExpression);
+        DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, referenceExpression);
         if (declarationDescriptor == null) {
             return Lists.newArrayList(bindingContext.get(BindingContext.LABEL_TARGET, referenceExpression));
         }
@@ -99,7 +97,7 @@ public class BindingContextUtils {
             descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
         }
         else if (element instanceof JetSimpleNameExpression) {
-            descriptor = referenceToDescriptor(bindingContext, (JetSimpleNameExpression) element);
+            descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, (JetSimpleNameExpression) element);
         }
         else if (element instanceof JetQualifiedExpression) {
             descriptor = extractVariableDescriptorIfAny(bindingContext, ((JetQualifiedExpression) element).getSelectorExpression(), onlyReference);
@@ -110,16 +108,6 @@ public class BindingContextUtils {
         return null;
     }
 
-    @Nullable
-    public static DeclarationDescriptor referenceToDescriptor(@NotNull BindingContext bindingContext, @Nullable JetReferenceExpression element) {
-        DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, element);
-        ResolvedCall<? extends CallableDescriptor> resolvedCall = bindingContext.get(BindingContext.RESOLVED_CALL, element);
-        if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
-            descriptor = ((VariableAsFunctionResolvedCall) resolvedCall).getVariableCall().getResultingDescriptor();
-        }
-        return descriptor;
-    }
-
     // TODO these helper methods are added as a workaround to some compiler bugs in Kotlin...
 
     // NOTE this is used by KDoc
diff --git a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
index 04c4096dfae..ee617dca797 100644
--- a/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+++ b/idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
@@ -149,7 +149,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
     @Nullable
     public PsiElement resolveStandardLibrarySymbol(@NotNull BindingContext originalContext, @Nullable JetReferenceExpression referenceExpression) {
         ensureInitialized();
-        DeclarationDescriptor declarationDescriptor = BindingContextUtils.referenceToDescriptor(originalContext, referenceExpression);
+        DeclarationDescriptor declarationDescriptor = originalContext.get(BindingContext.REFERENCE_TARGET, referenceExpression);
 
         return declarationDescriptor != null ? resolveStandardLibrarySymbol(declarationDescriptor) : null;
     }