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

Move the check that actual type is definition if type var is definition to the top of the corresponding method.

Browse Source 
GitOrigin-RevId: e2cfe01d00159b76bc3257df771b76bc2bec89fb
This commit is contained in:
Semyon Proshev
2020-04-17 21:12:01 +00:00
committed by intellij-monorepo-bot
parent 24469a7069
commit 36a6a3ab65
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-psi-impl/src/com/jetbrains/python/psi/types/PyTypeChecker.java
+5 -4
View File
@@ -180,11 +180,15 @@ public class PyTypeChecker {
* The method mutates {@code context.substitutions} map adding new entries into it
*/
private static boolean match(@NotNull PyGenericType expected, @Nullable PyType actual, @NotNull MatchContext context) {
if (expected.isDefinition() && actual instanceof PyInstantiableType && !((PyInstantiableType<?>)actual).isDefinition()) {
return false;
}
final PyType substitution = context.substitutions.get(expected);
PyType bound = expected.getBound();
// Promote int in Type[TypeVar('T', int)] to Type[int] before checking that bounds match
if (expected.isDefinition()) {
final Function<PyType, PyType> toDefinition = t -> t instanceof PyInstantiableType ? ((PyInstantiableType)t).toClass() : t;
final Function<PyType, PyType> toDefinition = t -> t instanceof PyInstantiableType ? ((PyInstantiableType<?>)t).toClass() : t;
bound = PyUnionType.union(PyTypeUtil.toStream(bound).map(toDefinition).toList());
}
@@ -208,9 +212,6 @@ public class PyTypeChecker {
}
if (actual != null) {
if (expected.isDefinition() && !(actual instanceof PyInstantiableType && ((PyInstantiableType)actual).isDefinition())) {
return false;
}
context.substitutions.put(expected, actual);
}
else if (bound != null) {