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

PyControlFlowBuilder: don't ignore negativeAssertionEvaluator results if assertionEvaluator doesn't give any suggestions.

Browse Source 
PyTypeTest.testOptionalAfterIfNot fixed.
This commit is contained in:
Semyon Proshev
2017-04-13 18:55:20 +03:00
parent c450300c44
commit 8db4783d57
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+10 -13
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -365,17 +365,13 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
});
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
}
boolean noPendingInScopeEdges = false;
if (!assertionEvaluator.getDefinitions().isEmpty()) {
final Ref<Boolean> pendingInScopeEdges = Ref.create(false);
myBuilder.processPending((pendingScope, instruction) -> {
if (pendingScope != null && PsiTreeUtil.isAncestor(node, pendingScope, false)) {
pendingInScopeEdges.set(true);
}
myBuilder.addPendingEdge(pendingScope, instruction);
});
noPendingInScopeEdges = !pendingInScopeEdges.get();
}
final Ref<Boolean> pendingInScopeEdges = Ref.create(false);
myBuilder.processPending((pendingScope, instruction) -> {
if (pendingScope != null && PsiTreeUtil.isAncestor(node, pendingScope, false)) {
pendingInScopeEdges.set(true);
}
myBuilder.addPendingEdge(pendingScope, instruction);
});
final PyTypeAssertionEvaluator negativeAssertionEvaluator = new PyTypeAssertionEvaluator(false);
final PyExpression ifCondition = ifPart.getCondition();
// TODO: Add support for 'elif'
@@ -391,7 +387,7 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
elseBranch.accept(this);
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
} else {
if (noPendingInScopeEdges) {
if (!pendingInScopeEdges.get()) {
myBuilder.prevInstruction = lastBranchingPoint;
InstructionBuilder.addAssertInstructions(myBuilder, negativeAssertionEvaluator);
myBuilder.addPendingEdge(node, myBuilder.prevInstruction);
@@ -764,6 +760,7 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
}
}
@Override
public void visitPyAssertStatement(final PyAssertStatement node) {
myBuilder.startNode(node);
super.visitPyAssertStatement(node);