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

PY-1426 Code after 'with self.assertRaises' block in Python 2.7 unit tests is incorrectly highlighted as unreachable

Browse Source
This commit is contained in:
Oleg Shpynov
2010-07-27 14:45:19 +04:00
parent 0777d886ee
commit 3422c0e859
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+41
View File
@@ -4,10 +4,13 @@ import com.intellij.codeInsight.controlflow.ControlFlow;
import com.intellij.codeInsight.controlflow.ControlFlowBuilder;
import com.intellij.codeInsight.controlflow.Instruction;
import com.intellij.codeInsight.controlflow.impl.InstructionImpl;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.PyElementTypes;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyAugAssignmentStatementNavigator;
import com.jetbrains.python.psi.impl.PyImportStatementNavigator;
@@ -21,6 +24,8 @@ import java.util.List;
*/
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();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -586,4 +591,40 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
body.accept(this);
}
}
@Override
public void visitPyWithStatement(final PyWithStatement node) {
boolean withSelfAssertRaises = false;
final PyWithItem[] items = node.getWithItems();
if (items.length == 1){
final PyWithItem item = items[0];
final ASTNode callNode = item.getNode().findChildByType(CALL_OR_REF_EXPR);
if (callNode != null) {
final PsiElement element = callNode.getPsi();
if (element instanceof PyCallExpression) {
withSelfAssertRaises = SELF_ASSERT_RAISES.equals(((PyCallExpression)element).getCallee().getText());
}
if (element instanceof PyReferenceExpression){
withSelfAssertRaises = SELF_ASSERT_RAISES.equals(element.getText());
}
}
}
super.visitPyWithStatement(node);
if (withSelfAssertRaises){
myBuilder.processPending(new ControlFlowBuilder.PendingProcessor() {
public void process(final PsiElement pendingScope, final Instruction instruction) {
final PsiElement element = instruction.getElement();
if (element == null){
myBuilder.addPendingEdge(pendingScope, instruction);
}
else if (PsiTreeUtil.getParentOfType(element, PyRaiseStatement.class) != null){
myBuilder.addPendingEdge(node, instruction);
}
else {
myBuilder.addPendingEdge(pendingScope, instruction);
}
}
});
}
}
}