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

Slow TypeEvalContext for completion variants, current context for resolve

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-05-08 19:50:00 +04:00
parent c1b39569a1
commit 0eb7ccfa97
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/types/PyClassTypeImpl.java
+8 -7
View File
@@ -201,7 +201,7 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
}
if (isDefinition() && myClass.isNewStyleClass()) {
PyClassType typeType = getMetaclassType();
PyClassType typeType = getMetaclassType(context);
if (typeType != null) {
List<? extends RatedResolveResult> typeMembers = typeType.resolveMember(name, location, direction, resolveContext);
if (typeMembers != null && !typeMembers.isEmpty()) {
@@ -237,10 +237,10 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
}
@Nullable
private PyClassType getMetaclassType() {
private PyClassType getMetaclassType(@NotNull TypeEvalContext context) {
final PyTargetExpression metaClassAttribute = myClass.findClassAttribute(PyNames.DUNDER_METACLASS, true);
if (metaClassAttribute != null) {
final PyType type = TypeEvalContext.fastStubOnly(null).getType(metaClassAttribute);
final PyType type = context.getType(metaClassAttribute);
if (type instanceof PyClassType) {
return (PyClassType)type;
}
@@ -348,7 +348,8 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
boolean suppressParentheses = context.get(CTX_SUPPRESS_PARENTHESES) != null;
addOwnClassMembers(location, namesAlready, suppressParentheses, ret);
addInheritedMembers(prefix, location, namesAlready, context, ret);
final TypeEvalContext typeEvalContext = TypeEvalContext.slow();
addInheritedMembers(prefix, location, namesAlready, context, ret, typeEvalContext);
// from providers
for (PyClassMembersProvider provider : Extensions.getExtensions(PyClassMembersProvider.EP_NAME)) {
@@ -374,7 +375,7 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
}
if (isDefinition() && myClass.isNewStyleClass()) {
PyClassType typeType = getMetaclassType();
final PyClassType typeType = getMetaclassType(typeEvalContext);
if (typeType != null) {
Collections.addAll(ret, typeType.getCompletionVariants(prefix, location, context));
}
@@ -432,7 +433,8 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
PyExpression expressionHook,
Set<String> namesAlready,
ProcessingContext context,
List<Object> ret) {
List<Object> ret,
@NotNull TypeEvalContext typeEvalContext) {
for (PyExpression expression : myClass.getSuperClassExpressions()) {
final PsiReference reference = expression.getReference();
PsiElement element = null;
@@ -444,7 +446,6 @@ public class PyClassTypeImpl extends UserDataHolderBase implements PyClassType {
type = new PyClassTypeImpl((PyClass)element, myIsDefinition);
}
else {
final TypeEvalContext typeEvalContext = TypeEvalContext.fastStubOnly(myClass.getContainingFile());
type = typeEvalContext.getType(expression);
if (type instanceof PyClassType && !myIsDefinition) {
type = ((PyClassType)type).toInstance();