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

Fix doing type assertions for <ref> is <ref> statements, None should be presented on one side only (PY-29748)

Browse Source
This commit is contained in:
Semyon Proshev
2018-07-02 20:00:19 +03:00
parent 26791bb70a
commit 4ba52eb062
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java
+10 -12
View File
@@ -103,20 +103,18 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor {
final boolean leftIsNone = lhs instanceof PyNoneLiteralExpression || PyNames.NONE.equals(lhs.getName());
final boolean rightIsNone = rhs instanceof PyNoneLiteralExpression || PyNames.NONE.equals(rhs.getName());
if (leftIsNone && rightIsNone) {
return;
}
if (leftIsNone ^ rightIsNone) {
final PyReferenceExpression target = (PyReferenceExpression)(rightIsNone ? lhs : rhs);
final PyReferenceExpression target = (PyReferenceExpression)(rightIsNone ? lhs : rhs);
if (node.isOperator(PyNames.IS)) {
pushAssertion(target, myPositive, false, context -> PyNoneType.INSTANCE);
return;
}
if (node.isOperator(PyNames.IS)) {
pushAssertion(target, myPositive, false, context -> PyNoneType.INSTANCE);
return;
}
if (node.isOperator("isnot")) {
pushAssertion(target, !myPositive, false, context -> PyNoneType.INSTANCE);
return;
if (node.isOperator("isnot")) {
pushAssertion(target, !myPositive, false, context -> PyNoneType.INSTANCE);
return;
}
}
}
python/testSrc/com/jetbrains/python/PyTypeTest.java
+8
View File
@@ -3244,6 +3244,14 @@ public class PyTypeTest extends PyTestCase {
"expr = T");
}
// PY-29748
public void testAfterIdentityComparison() {
doTest("int",
"a = 1\n" +
"if a is a:\n" +
" expr = a");
}
private static List<TypeEvalContext> getTypeEvalContexts(@NotNull PyExpression element) {
return ImmutableList.of(TypeEvalContext.codeAnalysis(element.getProject(), element.getContainingFile()).withTracing(),
TypeEvalContext.userInitiated(element.getProject(), element.getContainingFile()).withTracing());