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

simplified attr outside init search

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-10-08 15:59:41 +04:00
parent fd24faac69
commit ecec49d524
1 changed files with 8 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyAttributeOutsideInitInspection.java
+8 -33
View File
@@ -6,11 +6,11 @@ import com.intellij.psi.PsiElementVisitor;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.inspections.quickfix.PyMoveAttributeToInitQuickFix;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyCallExpressionHelper;
import com.jetbrains.python.psi.Property;
import com.jetbrains.python.psi.PyClass;
import com.jetbrains.python.psi.PyFunction;
import com.jetbrains.python.psi.PyTargetExpression;
import com.jetbrains.python.psi.impl.PyClassImpl;
import com.jetbrains.python.psi.types.PyClassType;
import com.jetbrains.python.psi.types.PyType;
import com.jetbrains.python.testing.PythonUnitTestUtil;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -65,14 +65,11 @@ public class PyAttributeOutsideInitInspection extends PyInspection {
final PyFunction initMethod = containingClass.findMethodByName(PyNames.INIT, false);
if (initMethod != null) {
PyClassImpl.collectInstanceAttributes(initMethod, attributesInInit);
collectAttributesFromSuper(attributesInInit, initMethod);
}
else {
for (PyClass superClass : containingClass.getAncestorClasses(myTypeEvalContext)) {
final PyFunction superInit = superClass.findMethodByName(PyNames.INIT, false);
if (superInit != null)
PyClassImpl.collectInstanceAttributes(superInit, attributesInInit);
}
for (PyClass superClass : containingClass.getAncestorClasses(myTypeEvalContext)) {
final PyFunction superInit = superClass.findMethodByName(PyNames.INIT, false);
if (superInit != null)
PyClassImpl.collectInstanceAttributes(superInit, attributesInInit);
}
Map<String, PyTargetExpression> attributes = new HashMap<String, PyTargetExpression>();
@@ -86,28 +83,6 @@ public class PyAttributeOutsideInitInspection extends PyInspection {
}
}
}
private void collectAttributesFromSuper(Map<String, PyTargetExpression> attributesInInit, PyFunction initMethod) {
final PyStatementList statementList = initMethod.getStatementList();
if (statementList != null) {
for (PyStatement statement : statementList.getStatements()) {
if (statement instanceof PyExpressionStatement) {
final PyExpression expression = ((PyExpressionStatement)statement).getExpression();
if (expression instanceof PyCallExpression) {
final PyType callType = PyCallExpressionHelper.getCallType((PyCallExpression)expression, myTypeEvalContext);
if (callType instanceof PyClassType) {
final PyClass superClass = ((PyClassType)callType).getPyClass();
final PyFunction superInit = superClass.findMethodByName(PyNames.INIT, false);
if (superInit != null) {
PyClassImpl.collectInstanceAttributes(superInit, attributesInInit);
collectAttributesFromSuper(attributesInInit, superInit);
}
}
}
}
}
}
}
}
private static boolean isApplicable(@NotNull final PyClass containingClass) {