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

Current TypeEvalContext for comparing references to methods

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-05-08 19:05:55 +04:00
parent 23ed6bcdaa
commit 4f0702e71d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/references/PyQualifiedReference.java
+11 -11
View File
@@ -382,18 +382,8 @@ public class PyQualifiedReference extends PyReferenceImpl {
return false;
}
final String referencedName = myElement.getReferencedName();
if (element instanceof PyFunction && Comparing.equal(referencedName, ((PyFunction)element).getName()) &&
((PyFunction)element).getContainingClass() != null && !PyNames.INIT.equals(referencedName)) {
final PyExpression qualifier = myElement.getQualifier();
if (qualifier != null) {
final TypeEvalContext context = TypeEvalContext.fast();
PyType qualifierType = context.getType(qualifier);
if (qualifierType == null || qualifierType instanceof PyTypeReference) {
return true;
}
}
}
PyResolveContext resolveContext = myContext.withoutImplicits();
// Guess type eval context origin for switching to local dataflow and return type analysis
if (resolveContext.getTypeEvalContext().getOrigin() == null) {
final PsiFile containingFile = myElement.getContainingFile();
if (containingFile instanceof StubBasedPsiElement) {
@@ -402,6 +392,16 @@ public class PyQualifiedReference extends PyReferenceImpl {
final TypeEvalContext context = TypeEvalContext.fastStubOnly(containingFile);
resolveContext = resolveContext.withTypeEvalContext(context);
}
if (element instanceof PyFunction && Comparing.equal(referencedName, ((PyFunction)element).getName()) &&
((PyFunction)element).getContainingClass() != null && !PyNames.INIT.equals(referencedName)) {
final PyExpression qualifier = myElement.getQualifier();
if (qualifier != null) {
final PyType qualifierType = resolveContext.getTypeEvalContext().getType(qualifier);
if (qualifierType == null || qualifierType instanceof PyTypeReference) {
return true;
}
}
}
for (ResolveResult result : copyWithResolveContext(resolveContext).multiResolve(false)) {
LOG.assertTrue(!(result instanceof ImplicitResolveResult));
PsiElement resolveResult = result.getElement();