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

Check __metaclass__ attribute only for Python 2.x

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2014-01-20 23:33:51 +04:00
parent bf9a384d08
commit 92107d2468
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
+23 -21
View File
@@ -1172,27 +1172,8 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
@Nullable
@Override
public PyClassLikeType getMetaClassType(@NotNull TypeEvalContext context) {
final PyTargetExpression metaClassAttribute = findClassAttribute(PyNames.DUNDER_METACLASS, false);
if (metaClassAttribute != null) {
final PyExpression expression = metaClassAttribute.findAssignedValue();
final PyClass metaclass = getMetaFromExpression(expression);
if (metaclass != null) {
return new PyClassTypeImpl(metaclass, false);
}
}
final PsiFile containingFile = getContainingFile();
if (containingFile instanceof PyFile) {
final PsiElement element = ((PyFile)containingFile).getElementNamed(PyNames.DUNDER_METACLASS);
if (element instanceof PyTargetExpression) {
final PyExpression expression = ((PyTargetExpression)element).findAssignedValue();
final PyClass metaclass = getMetaFromExpression(expression);
if (metaclass != null) {
return new PyClassTypeImpl(metaclass, false);
}
}
}
if (LanguageLevel.forElement(this).isPy3K()) {
final LanguageLevel level = LanguageLevel.forElement(this);
if (level.isAtLeast(LanguageLevel.PYTHON30)) {
final PyExpression[] superClassExpressions = getSuperClassExpressions();
for (PyExpression superClassExpression : superClassExpressions) {
if (superClassExpression instanceof PyKeywordArgument &&
@@ -1205,6 +1186,27 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
}
}
}
else {
final PyTargetExpression metaClassAttribute = findClassAttribute(PyNames.DUNDER_METACLASS, false);
if (metaClassAttribute != null) {
final PyExpression expression = metaClassAttribute.findAssignedValue();
final PyClass metaclass = getMetaFromExpression(expression);
if (metaclass != null) {
return new PyClassTypeImpl(metaclass, false);
}
}
final PsiFile containingFile = getContainingFile();
if (containingFile instanceof PyFile) {
final PsiElement element = ((PyFile)containingFile).getElementNamed(PyNames.DUNDER_METACLASS);
if (element instanceof PyTargetExpression) {
final PyExpression expression = ((PyTargetExpression)element).findAssignedValue();
final PyClass metaclass = getMetaFromExpression(expression);
if (metaclass != null) {
return new PyClassTypeImpl(metaclass, false);
}
}
}
}
return null;
}