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

teach PyFileEvaluator to keep track of declarations; get rid of old code for parsing aug assignments and 'extend' calls

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-08-08 13:14:33 +02:00
parent 6f3c795216
commit 201f8d3d49
2 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
+1 -45
View File
@@ -1,6 +1,5 @@
package com.jetbrains.python.psi.impl;
import com.google.common.collect.Lists;
import com.intellij.extapi.psi.ASTDelegatePsiElement;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
@@ -18,7 +17,6 @@ import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/**
@@ -324,7 +322,7 @@ public class PyPsiUtils {
return result;
}
private static void sequenceToList(List<PyExpression> result, PyExpression value) {
public static void sequenceToList(List<PyExpression> result, PyExpression value) {
value = flattenParens(value);
if (value instanceof PySequenceExpression) {
result.addAll(ContainerUtil.newArrayList(((PySequenceExpression)value).getElements()));
@@ -362,48 +360,6 @@ public class PyPsiUtils {
return element.getTextOffset() <= element2.getTextOffset();
}
public static Collection<? extends PyExpression> getAugAssignments(final @NotNull PyFile file, final @NotNull String name) {
final List<PyExpression> result = Lists.newArrayList();
file.accept(new TopLevelVisitor() {
@Override
protected void checkAddElement(PsiElement node) {
if (node instanceof PyAugAssignmentStatement) {
PyAugAssignmentStatement augAss = (PyAugAssignmentStatement)node;
if (name.equals(augAss.getTarget().getName())) {
sequenceToList(result, augAss.getValue());
}
}
}
});
return result;
}
public static Collection<? extends PyExpression> getCallArguments(final @NotNull PyFile file,
final @NotNull String name,
final @NotNull String callName) {
final List<PyExpression> result = Lists.newArrayList();
file.accept(new TopLevelVisitor() {
@Override
protected void checkAddElement(PsiElement node) {
if (node instanceof PyCallExpression) {
PyCallExpression call = (PyCallExpression)node;
if (call.getCallee() instanceof PyReferenceExpression) {
PyReferenceExpression ref = (PyReferenceExpression)call.getCallee();
if (callName.equals(ref.getName())) {
PyExpression ex = ref.getQualifier();
if (name.equals(ex.getName())) {
for (PyExpression expr : call.getArguments()) {
sequenceToList(result, expr);
}
}
}
}
}
}
});
return result;
}
private static abstract class TopLevelVisitor extends PyRecursiveElementVisitor {
public void visitPyElement(final PyElement node) {
super.visitPyElement(node);