Skip to content

Improve match statement union narrowing/inference #17600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions mypy/checkpattern.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,27 @@ def visit_sequence_pattern(self, o: SequencePattern) -> PatternType:
# get inner types of original type
#
unpack_index = None

if isinstance(current_type, UnionType):
union_captures: dict[Expression, Type] = {}
union_items: list[Type] = []
for t in current_type.items:
typ, _, capture = self.accept(o, t)
if not is_uninhabited(get_proper_type(typ)):
union_items.append(typ)
union_captures.update(capture)

rest_items: list[Type] = []
for item in current_type.items:
if all(used_item != item for used_item in union_items):
rest_items.append(item)

return PatternType(
type=UnionType.make_union(items=union_items),
rest_type=UnionType.make_union(items=rest_items),
captures=union_captures,
)

if isinstance(current_type, TupleType):
inner_types = current_type.items
unpack_index = find_unpack_in_list(inner_types)
Expand Down
5 changes: 2 additions & 3 deletions test-data/unit/check-python310.test
Original file line number Diff line number Diff line change
Expand Up @@ -1777,12 +1777,11 @@ match foo:
[case testMatchUnionTwoTuplesNoCrash]
var: tuple[int, int] | tuple[str, str]

# TODO: we can infer better here.
match var:
case (42, a):
reveal_type(a) # N: Revealed type is "Union[builtins.int, builtins.str]"
reveal_type(a) # N: Revealed type is "builtins.int"
case ("yes", b):
reveal_type(b) # N: Revealed type is "Union[builtins.int, builtins.str]"
reveal_type(b) # N: Revealed type is "builtins.str"
[builtins fixtures/tuple.pyi]

[case testMatchNamedAndKeywordsAreTheSame]
Expand Down
Loading