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

PY-24729 Alternative way to discover assignment to an instance attribute

Browse Source
This commit is contained in:
Mikhail Golubev
2017-12-14 19:00:46 +03:00
parent ae58f4e52a
commit 1857a07baa
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/typing/PyTypingTypeProvider.java
+17 -20
View File
@@ -333,34 +333,31 @@ public class PyTypingTypeProvider extends PyTypeProviderBase {
}
final PyClass pyClass = target.getContainingClass();
// an assignment inside a method
if (pyClass != null && target.isQualified() && ScopeUtil.getScopeOwner(target) instanceof PyFunction) {
final PyFunction method = as(ScopeUtil.getScopeOwner(target), PyFunction.class);
if (pyClass != null && method != null && target.isQualified()) {
final String name = target.getReferencedName();
final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(context);
final StreamEx<PyType> typeStream;
boolean isInstanceAttribute = false;
if (context.maySwitchToAST(target)) {
final PyType qualifierType = context.getType(target.getQualifier());
if (qualifierType instanceof PyUnionType) {
typeStream = StreamEx.of(((PyUnionType)qualifierType).getMembers());
}
else {
typeStream = StreamEx.of(qualifierType);
}
}
else if (PyUtil.isInstanceAttribute(target)) {
typeStream = StreamEx.of(new PyClassTypeImpl(pyClass, false));
isInstanceAttribute = StreamEx.of(PyUtil.multiResolveTopPriority(target.getQualifier(), resolveContext))
.select(PyParameter.class)
.filter(PyParameter::isSelf)
.anyMatch(p -> PsiTreeUtil.getParentOfType(p, PyFunction.class) == method);
}
else {
isInstanceAttribute = PyUtil.isInstanceAttribute(target);
}
if (!isInstanceAttribute) {
return null;
}
return typeStream
.select(PyClassLikeType.class)
.map(PyClassLikeType::toClass) // force search on the class level right away
.flatMap(x -> {
final List<? extends RatedResolveResult> resolved = x.resolveMember(name, target, AccessDirection.READ, resolveContext, true);
return resolved == null ? StreamEx.empty() : StreamEx.of(resolved);
})
// Set isDefinition=true to start searching right from the class level.
final PyClassTypeImpl classType = new PyClassTypeImpl(pyClass, true);
final List<? extends RatedResolveResult> classAttrs = classType.resolveMember(name, target, AccessDirection.READ, resolveContext, true);
if (classAttrs == null) {
return null;
}
return StreamEx.of(classAttrs)
.map(RatedResolveResult::getElement)
.select(PyTargetExpression.class)
.filter(x -> ScopeUtil.getScopeOwner(x) instanceof PyClass)