From 6804db3b66edcca67f6719ce06f3b72bcde26738 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 28 Aug 2012 16:44:53 +0200
Subject: [PATCH] pull up getReference(PyResolveContext) to
 PyQualifiedReference interface

---
 .../jetbrains/python/psi/PyQualifiedExpression.java    |  6 ++++++
 .../jetbrains/python/psi/PyReferenceExpression.java    |  3 ---
 .../python/psi/impl/PyTargetExpressionImpl.java        | 10 ++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java b/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
index 4c90d5077308..1a2ed465955e 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
@@ -1,6 +1,9 @@
 package com.jetbrains.python.psi;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiPolyVariantReference;
+import com.jetbrains.python.psi.resolve.PyResolveContext;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -27,4 +30,7 @@ public interface PyQualifiedExpression extends PyExpression {
    */
   @Nullable
   ASTNode getNameElement();
+
+  @NotNull
+  PsiPolyVariantReference getReference(PyResolveContext resolveContext);
 }
diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java b/python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
index 1dbfa329f11d..c2a6a3597836 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
@@ -30,7 +30,4 @@ public interface PyReferenceExpression extends PyQualifiedExpression, PyReferenc
 
   @NotNull
   PsiPolyVariantReference getReference();
-
-  @NotNull
-  PsiPolyVariantReference getReference(PyResolveContext resolveContext);
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
index eafcb179fd1f..0a227454c8c1 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
@@ -5,6 +5,7 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiPolyVariantReference;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -481,10 +482,15 @@ public class PyTargetExpressionImpl extends PyPresentableElementImpl<PyTargetExp
   @NotNull
   @Override
   public PsiReference getReference() {
+    return getReference(PyResolveContext.defaultContext());
+  }
+
+  @NotNull
+  public PsiPolyVariantReference getReference(final PyResolveContext resolveContext) {
     if (getQualifier() != null) {
-      return new PyQualifiedReference(this, PyResolveContext.defaultContext());
+      return new PyQualifiedReference(this, resolveContext);
     }
-    return new PyTargetReference(this, PyResolveContext.defaultContext());
+    return new PyTargetReference(this, resolveContext);
   }
 
   @NotNull