@@ -840,21 +840,45 @@ def test_unbound_type(self) -> None:
840840 self .assert_join (t , UnboundType ("X" ), self .fx .anyt )
841841
842842 def test_any_type (self ) -> None :
843- # Join against 'Any' type always results in 'Any'.
844843 with state .strict_optional_set (False ):
845844 self .assert_join (NoneType (), self .fx .anyt , self .fx .anyt )
846845
847846 for t in [
848- self .fx .anyt ,
849847 self .fx .a ,
850- self .fx .o ,
851- NoneType (),
852848 UnboundType ("x" ),
853849 self .fx .t ,
854850 self .tuple (),
855851 self .callable (self .fx .a , self .fx .b ),
856852 ]:
857- self .assert_join (t , self .fx .anyt , self .fx .anyt )
853+ self .assert_join (t , self .fx .anyt , UnionType ([t , self .fx .anyt ]))
854+ self .assert_join (self .fx .anyt , t , UnionType ([t , self .fx .anyt ]))
855+
856+ self .assert_join (self .fx .anyt , self .fx .anyt , self .fx .anyt )
857+
858+ self .assert_join (self .fx .o , self .fx .anyt , self .fx .o )
859+ self .assert_join (NoneType (), self .fx .anyt , UnionType ([self .fx .anyt , NoneType ()]))
860+ self .assert_join (UninhabitedType (), self .fx .anyt , self .fx .anyt )
861+
862+ self .assert_join (self .fx .anyt , self .fx .o , self .fx .o )
863+ self .assert_join (self .fx .anyt , NoneType (), UnionType ([self .fx .anyt , NoneType ()]))
864+ self .assert_join (self .fx .anyt , UninhabitedType (), self .fx .anyt )
865+
866+ def test_any_type_with_union (self ) -> None :
867+ self .assert_join (
868+ UnionType ([self .fx .a , self .fx .anyt ]),
869+ self .fx .anyt ,
870+ UnionType ([self .fx .a , self .fx .anyt ]),
871+ )
872+ self .assert_join (
873+ self .fx .anyt ,
874+ UnionType ([self .fx .a , self .fx .anyt ]),
875+ UnionType ([self .fx .a , self .fx .anyt ]),
876+ )
877+ self .assert_join (
878+ UnionType ([self .fx .a , self .fx .anyt ]),
879+ UnionType ([self .fx .a , self .fx .anyt ]),
880+ UnionType ([self .fx .a , self .fx .anyt ]),
881+ )
858882
859883 def test_mixed_truth_restricted_type_simple (self ) -> None :
860884 # make_simplified_union against differently restricted truthiness types drops restrictions.
@@ -885,7 +909,7 @@ def test_simple_generics(self) -> None:
885909 with state .strict_optional_set (True ):
886910 self .assert_join (self .fx .ga , self .fx .nonet , UnionType ([self .fx .ga , NoneType ()]))
887911
888- self .assert_join (self .fx .ga , self .fx .anyt , self .fx .anyt )
912+ self .assert_join (self .fx .ga , self .fx .anyt , UnionType ([ self .fx .ga , self . fx . anyt ]) )
889913
890914 for t in [
891915 self .fx .a ,
@@ -938,7 +962,9 @@ def test_callables_with_any(self) -> None:
938962 self .assert_join (
939963 self .callable (self .fx .a , self .fx .a , self .fx .anyt , self .fx .a ),
940964 self .callable (self .fx .a , self .fx .anyt , self .fx .a , self .fx .anyt ),
941- self .callable (self .fx .a , self .fx .anyt , self .fx .anyt , self .fx .anyt ),
965+ self .callable (
966+ self .fx .a , self .fx .anyt , self .fx .anyt , UnionType ([self .fx .a , self .fx .anyt ])
967+ ),
942968 )
943969
944970 def test_overloaded (self ) -> None :
@@ -1016,12 +1042,14 @@ def test_simple_type_objects(self) -> None:
10161042
10171043 def test_type_type (self ) -> None :
10181044 self .assert_join (self .fx .type_a , self .fx .type_b , self .fx .type_a )
1019- self .assert_join (self .fx .type_b , self .fx .type_any , self .fx .type_any )
1045+ self .assert_join (
1046+ self .fx .type_b , self .fx .type_any , UnionType ([self .fx .type_b , self .fx .type_any ])
1047+ )
10201048 self .assert_join (self .fx .type_b , self .fx .type_type , self .fx .type_type )
10211049 self .assert_join (self .fx .type_b , self .fx .type_c , self .fx .type_a )
10221050 self .assert_join (self .fx .type_c , self .fx .type_d , TypeType .make_normalized (self .fx .o ))
10231051 self .assert_join (self .fx .type_type , self .fx .type_any , self .fx .type_type )
1024- self .assert_join (self .fx .type_b , self .fx .anyt , self .fx .anyt )
1052+ self .assert_join (self .fx .type_b , self .fx .anyt , UnionType ([ self .fx .type_b , self . fx . anyt ]) )
10251053
10261054 def test_literal_type (self ) -> None :
10271055 a = self .fx .a
@@ -1035,7 +1063,7 @@ def test_literal_type(self) -> None:
10351063 self .assert_join (lit1 , d , self .fx .o )
10361064 self .assert_join (lit1 , lit2 , a )
10371065 self .assert_join (lit1 , lit3 , self .fx .o )
1038- self .assert_join (lit1 , self .fx .anyt , self .fx .anyt )
1066+ self .assert_join (lit1 , self .fx .anyt , UnionType ([ lit1 , self .fx .anyt ]) )
10391067 self .assert_join (UnionType ([lit1 , lit2 ]), lit2 , UnionType ([lit1 , lit2 ]))
10401068 self .assert_join (UnionType ([lit1 , lit2 ]), a , a )
10411069 self .assert_join (UnionType ([lit1 , lit3 ]), a , UnionType ([a , lit3 ]))
@@ -1324,7 +1352,12 @@ def test_callables_with_dynamic(self) -> None:
13241352 self .assert_meet (
13251353 self .callable (self .fx .a , self .fx .a , self .fx .anyt , self .fx .a ),
13261354 self .callable (self .fx .a , self .fx .anyt , self .fx .a , self .fx .anyt ),
1327- self .callable (self .fx .a , self .fx .anyt , self .fx .anyt , self .fx .anyt ),
1355+ self .callable (
1356+ self .fx .a ,
1357+ UnionType ([self .fx .a , self .fx .anyt ]),
1358+ UnionType ([self .fx .a , self .fx .anyt ]),
1359+ self .fx .a ,
1360+ ),
13281361 )
13291362
13301363 def test_meet_interface_types (self ) -> None :
0 commit comments