[ty] Propagate type context through comprehensions#22564
Merged
ibraheemdev merged 4 commits intomainfrom Jan 20, 2026
Merged
Conversation
ibraheemdev
requested review from
AlexWaygood,
carljm,
dcreager and
sharkdp
as code owners
ibraheemdev
commented
Jan 14, 2026
|
|
||
| ```py | ||
| # TODO: This should reveal `Literal["a", "b"]` | ||
| # revealed: Unknown | str |
Member
Author
There was a problem hiding this comment.
This and the other todos are astral-sh/ty#2486 (and some will also be fixed indirectly by astral-sh/ty#1240).
ibraheemdev
commented
Jan 14, 2026
| tcx: TypeContext<'db>, | ||
| } | ||
|
|
||
| impl<'db> InferScope<'db> { |
Member
Author
There was a problem hiding this comment.
Ideally we could have a generic InferRegion type, but the salsa macros don't seem to like it.
Typing conformance resultsNo changes detected ✅ |
|
ibraheemdev
force-pushed
the
ibraheem/comprehension-tcx
branch
from
d27b4c6 to
c781969
Compare
|
| Lint rule | Added | Removed | Changed |
|---|---|---|---|
invalid-argument-type |
2 | 12 | 137 |
possibly-missing-attribute |
3 | 1 | 71 |
invalid-return-type |
0 | 25 | 37 |
invalid-assignment |
1 | 20 | 35 |
unsupported-operator |
0 | 0 | 32 |
not-iterable |
0 | 0 | 9 |
type-assertion-failure |
0 | 0 | 8 |
not-subscriptable |
0 | 0 | 6 |
unused-ignore-comment |
2 | 1 | 0 |
invalid-await |
2 | 0 | 0 |
unresolved-attribute |
0 | 0 | 2 |
| Total | 10 | 59 | 337 |
ibraheemdev
commented
Jan 15, 2026
carljm
approved these changes
Jan 16, 2026
Contributor
carljm
left a comment
carljm
left a comment
There was a problem hiding this comment.
Looks good!
I'm guessing we may want similar treatment for generator expressions at some point, but those have enough of their own wrinkles that it makes sense to handle them separately.
Comment on lines
8929
to
8938
| // Comprehensions are skipped when checking all scopes, so this is our only chance | ||
| // to report diagnostics. | ||
| if let Some(scope_diagnostics) = inference.diagnostics() { | ||
| self.context.extend(scope_diagnostics); | ||
| } | ||
|
|
||
| self.infer_comprehension_specialization(KnownClass::Dict, &[key_type, value_type], tcx) | ||
| self.infer_comprehension_specialization(KnownClass::Set, &[Some(elt)], inference, tcx) | ||
| .unwrap_or_else(|| { | ||
| KnownClass::Set.to_specialized_instance(self.db(), &[Type::unknown()]) | ||
| }) |
Contributor
There was a problem hiding this comment.
This is still a fair bit to duplicate for all comprehension kinds... seems like KnownClass::Set is the only set-distinct thing in here?
Member
Author
There was a problem hiding this comment.
It's slightly better now with the extend_scope method, I'm not sure we can do much better here. The list and set cases are similar because they both have a single element type, while dictionaries have two.
This was referenced Jan 16, 2026
ibraheemdev
force-pushed
the
ibraheem/comprehension-tcx
branch
from
fa2b058 to
109d2a5
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Resolves astral-sh/ty#1602.