MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

pull up getReference(PyResolveContext) to PyQualifiedReference interface

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-28 16:44:53 +02:00
parent cd2a799a6e
commit 6804db3b66
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/PyQualifiedExpression.java
+6
View File
@@ -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);
}
python/psi-api/src/com/jetbrains/python/psi/PyReferenceExpression.java
-3
View File
@@ -30,7 +30,4 @@ public interface PyReferenceExpression extends PyQualifiedExpression, PyReferenc
@NotNull
PsiPolyVariantReference getReference();
@NotNull
PsiPolyVariantReference getReference(PyResolveContext resolveContext);
}
python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
+8 -2
View File
@@ -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