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

Remove duplicate conversion from class type to instance type in PyTypeAssertionEvaluator

Browse Source 
Also special handling for "x = Sub(); assert isinstance(x, Super)"
doesn't conflict anymore with the support of cases like
"x = Sub(); assert not isinstance(x, Super)", i.e. we distinguish
between positive and negative type assertions when the actual type is a
subclass of the expected type. Though, strictly speaking, it hasn't
broken anything (yet).
This commit is contained in:
Mikhail Golubev
2017-03-20 12:47:50 +03:00
parent 72c0f8eace
commit 4120e431a8
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/controlflow/PyTypeAssertionEvaluator.java
+7 -16
View File
@@ -68,11 +68,7 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor {
final PyReferenceExpression target = (PyReferenceExpression)args[0];
final PyExpression typeElement = args[1];
// TODO support tuple of types as the second argument of isinstance()
pushAssertion(target, myPositive, context -> {
final PyType type = context.getType(typeElement);
return type instanceof PyClassType ? ((PyClassType)type).toInstance() : type;
});
pushAssertion(target, myPositive, context -> context.getType(typeElement));
}
}
else if (node.isCalleeText(PyNames.CALLABLE_BUILTIN)) {
@@ -150,6 +146,11 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor {
@NotNull TypeEvalContext context) {
final PyType transformedType = transformTypeFromAssertion(suggested);
if (positive) {
if (!(initial instanceof PyUnionType) &&
!PyTypeChecker.isUnknown(initial) &&
PyTypeChecker.match(transformedType, initial, context)) {
return initial;
}
return transformedType;
}
else if (initial instanceof PyUnionType) {
@@ -184,17 +185,7 @@ public class PyTypeAssertionEvaluator extends PyRecursiveElementVisitor {
final InstructionTypeCallback typeCallback = new InstructionTypeCallback() {
@Override
public PyType getType(TypeEvalContext context, @Nullable PsiElement anchor) {
final PyType initial = context.getType(target);
final PyType suggested = suggestedType.apply(context);
if (!(initial instanceof PyUnionType) &&
!PyTypeChecker.isUnknown(initial) &&
PyTypeChecker.match(suggested, initial, context)) {
return initial;
}
else {
return createAssertionType(initial, suggested, positive, context);
}
return createAssertionType(context.getType(target), suggestedType.apply(context), positive, context);
}
};