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

allow passing null to PyType.union()

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-11 17:31:29 +02:00
parent a539421134
commit 7ca3432cac
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/types/PyUnionType.java
+6
View File
@@ -73,6 +73,12 @@ public class PyUnionType implements PyType {
@Nullable
public static PyType union(PyType type1, PyType type2) {
if (type2 == null) {
return type1;
}
if (type1 == null) {
return type2;
}
if (type1 instanceof PyTupleType && type2 instanceof PyTupleType) {
final PyTupleType tupleType1 = (PyTupleType)type1;
final PyTupleType tupleType2 = (PyTupleType)type2;