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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-12-09 20:20:08 +01:00
parent c9dc1a2b46 eecad15f2f
commit f7419666e2
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+15 -21
View File
@@ -28,7 +28,6 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
public static final TokenSet CALL_OR_REF_EXPR = TokenSet.create(PyElementTypes.CALL_EXPRESSION, PyElementTypes.REFERENCE_EXPRESSION);
public static final String SELF_ASSERT_RAISES = "self.assertRaises";
private final ControlFlowBuilder myBuilder = new ControlFlowBuilder();
private List<Pair<PsiElement, Instruction>> myPendindBackup = null;
public ControlFlow buildControlFlow(@NotNull final ScopeOwner owner) {
return myBuilder.build(this, owner);
@@ -431,17 +430,20 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
// Process except parts
final ArrayList<Instruction> exceptInstructions = new ArrayList<Instruction>();
resetPendingBackup();
final List<Instruction> exceptInstructions = emptyMutableList();
List<Pair<PsiElement, Instruction>> pendingBackup = emptyMutableList();
for (PyExceptPart exceptPart : node.getExceptParts()) {
backupAndClearPending();
pendingBackup.addAll(myBuilder.pending);
myBuilder.pending = emptyMutableList();
myBuilder.flowAbrupted();
final Instruction exceptInstrcution = myBuilder.startNode(exceptPart);
exceptPart.accept(this);
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
exceptInstructions.add(exceptInstrcution);
}
restorePending();
for (Pair<PsiElement, Instruction> pair : pendingBackup) {
myBuilder.addPendingEdge(pair.first, pair.second);
}
final List<Instruction> normalExits = new ArrayList<Instruction>();
final PyFinallyPart finallyPart = node.getFinallyPart();
@@ -532,12 +534,15 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
final Instruction finallyInstruction;
if (!normalExits.isEmpty()) {
// Finally-success part handling
resetPendingBackup();
backupAndClearPending();
pendingBackup = emptyMutableList();
pendingBackup.addAll(myBuilder.pending);
myBuilder.pending = emptyMutableList();
myBuilder.flowAbrupted();
Instruction finallySuccessInstruction = myBuilder.startNode(finallyPart);
finallyPart.accept(this);
restorePending();
for (Pair<PsiElement, Instruction> pair : pendingBackup) {
myBuilder.addPendingEdge(pair.first, pair.second);
}
finallyInstruction = finallySuccessInstruction;
}
else {
@@ -551,19 +556,8 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
}
}
private void resetPendingBackup() {
myPendindBackup = new ArrayList<Pair<PsiElement, Instruction>>();
}
private void backupAndClearPending() {
myPendindBackup.addAll(myBuilder.pending);
myBuilder.pending = new ArrayList<Pair<PsiElement, Instruction>>();
}
private void restorePending() {
for (Pair<PsiElement, Instruction> pair : myPendindBackup) {
myBuilder.addPendingEdge(pair.first, pair.second);
}
private static <T> List<T> emptyMutableList() {
return new ArrayList<T>();
}
@Override
python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
+7 -2
View File
@@ -41,6 +41,7 @@ import com.jetbrains.python.documentation.DocStringParameterReference;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyBuiltinCache;
import com.jetbrains.python.psi.impl.PyImportReferenceImpl;
import com.jetbrains.python.psi.impl.PyImportStatementNavigator;
import com.jetbrains.python.psi.impl.PyOperatorReferenceImpl;
import com.jetbrains.python.psi.resolve.ImportedResolveResult;
import com.jetbrains.python.psi.resolve.PyResolveContext;
@@ -289,8 +290,12 @@ public class PyUnresolvedReferencesInspection extends PyInspection {
myAllImports.remove(node.getParent());
}
}
else if (reference instanceof PyImportReferenceImpl && target == reference.getElement().getContainingFile()) {
registerProblem(node, "Import resolves to its containing file");
else if (reference instanceof PyImportReferenceImpl &&
target == reference.getElement().getContainingFile()) {
final boolean insideFromImport = PsiTreeUtil.getParentOfType(node, PyFromImportStatement.class) != null;
if ((insideFromImport && PyImportStatementNavigator.getImportStatementByElement(node) != null) || !insideFromImport) {
registerProblem(node, "Import resolves to its containing file");
}
}
}