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

Refactored collecting instance attributes

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-04-10 20:49:26 +04:00
parent 6aff7c8749
commit eb3081f1fa
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
@@ -935,32 +935,34 @@ public class PyClassImpl extends PyPresentableElementImpl<PyClassStub> implement
return;
}
final PyFunctionStub methodStub = method.getStub();
if (methodStub != null) {
final PyTargetExpression[] targets = methodStub.getChildrenByType(PyElementTypes.TARGET_EXPRESSION, PyTargetExpression.EMPTY_ARRAY);
for (PyTargetExpression target : targets) {
if (!result.containsKey(target.getName())) {
result.put(target.getName(), target);
}
}
}
else {
final PyStatementList statementList = method.getStatementList();
if (statementList != null) {
statementList.accept(new PyRecursiveElementVisitor() {
public void visitPyAssignmentStatement(final PyAssignmentStatement node) {
collectNewTargets(result, node);
}
});
for (PyTargetExpression target : getTargetExpressions(method)) {
if (methodStub != null || PyUtil.isInstanceAttribute(target)) {
result.put(target.getName(), target);
}
}
}
private static void collectNewTargets(Map<String, PyTargetExpression> collected, PyAssignmentStatement node) {
final PyExpression[] targets = node.getTargets();
for (PyExpression target : targets) {
if (target instanceof PyTargetExpression && PyUtil.isInstanceAttribute(target)) {
collected.put(target.getName(), (PyTargetExpression)target);
@NotNull
private static List<PyTargetExpression> getTargetExpressions(@NotNull PyFunction function) {
final PyFunctionStub stub = function.getStub();
if (stub != null) {
return Arrays.asList(stub.getChildrenByType(PyElementTypes.TARGET_EXPRESSION, PyTargetExpression.EMPTY_ARRAY));
}
else {
final PyStatementList statementList = function.getStatementList();
final List<PyTargetExpression> result = new ArrayList<PyTargetExpression>();
if (statementList != null) {
statementList.accept(new PyRecursiveElementVisitor() {
public void visitPyAssignmentStatement(final PyAssignmentStatement node) {
for (PyExpression expression : node.getTargets()) {
if (expression instanceof PyTargetExpression) {
result.add((PyTargetExpression)expression);
}
}
}
});
}
return result;
}
}