mirror of
https://github.com/astral-sh/ruff.git
synced 2025-09-29 21:34:57 +00:00
[ty] Support as-patterns in reachability analysis (#19728)
Some checks are pending
CI / Determine changes (push) Waiting to run
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Waiting to run
CI / cargo build (msrv) (push) Blocked by required conditions
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / check playground (push) Blocked by required conditions
CI / benchmarks-instrumented (push) Blocked by required conditions
CI / benchmarks-walltime (push) Blocked by required conditions
[ty Playground] Release / publish (push) Waiting to run
Some checks are pending
CI / Determine changes (push) Waiting to run
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo test (linux) (push) Blocked by required conditions
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Waiting to run
CI / cargo build (msrv) (push) Blocked by required conditions
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / check playground (push) Blocked by required conditions
CI / benchmarks-instrumented (push) Blocked by required conditions
CI / benchmarks-walltime (push) Blocked by required conditions
[ty Playground] Release / publish (push) Waiting to run
## Summary Support `as` patterns in reachability analysis: ```py from typing import assert_never def f(subject: str | int): match subject: case int() as x: pass case str(): pass case _: assert_never(subject) # would previously emit an error ``` Note that we still don't support inferring correct types for the bound name (`x`). Closes https://github.com/astral-sh/ty/issues/928 ## Test Plan New Markdown tests
This commit is contained in:
parent
af8587eabf
commit
739c94f95a
8 changed files with 76 additions and 6 deletions
|
@ -838,6 +838,13 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
|
|||
.collect();
|
||||
PatternPredicateKind::Or(predicates)
|
||||
}
|
||||
ast::Pattern::MatchAs(pattern) => PatternPredicateKind::As(
|
||||
pattern
|
||||
.pattern
|
||||
.as_ref()
|
||||
.map(|p| Box::new(self.predicate_kind(p))),
|
||||
pattern.name.as_ref().map(|name| name.id.clone()),
|
||||
),
|
||||
_ => PatternPredicateKind::Unsupported,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
use ruff_db::files::File;
|
||||
use ruff_index::{Idx, IndexVec};
|
||||
use ruff_python_ast::Singleton;
|
||||
use ruff_python_ast::{Singleton, name::Name};
|
||||
|
||||
use crate::db::Db;
|
||||
use crate::semantic_index::expression::Expression;
|
||||
|
@ -136,6 +136,7 @@ pub(crate) enum PatternPredicateKind<'db> {
|
|||
Value(Expression<'db>),
|
||||
Or(Vec<PatternPredicateKind<'db>>),
|
||||
Class(Expression<'db>, ClassPatternKind),
|
||||
As(Option<Box<PatternPredicateKind<'db>>>, Option<Name>),
|
||||
Unsupported,
|
||||
}
|
||||
|
||||
|
|
|
@ -340,6 +340,10 @@ fn pattern_kind_to_type<'db>(db: &'db dyn Db, kind: &PatternPredicateKind<'db>)
|
|||
PatternPredicateKind::Or(predicates) => {
|
||||
UnionType::from_elements(db, predicates.iter().map(|p| pattern_kind_to_type(db, p)))
|
||||
}
|
||||
PatternPredicateKind::As(pattern, _) => pattern
|
||||
.as_deref()
|
||||
.map(|p| pattern_kind_to_type(db, p))
|
||||
.unwrap_or_else(|| Type::object(db)),
|
||||
PatternPredicateKind::Unsupported => Type::Never,
|
||||
}
|
||||
}
|
||||
|
@ -761,6 +765,10 @@ impl ReachabilityConstraints {
|
|||
}
|
||||
})
|
||||
}
|
||||
PatternPredicateKind::As(pattern, _) => pattern
|
||||
.as_deref()
|
||||
.map(|p| Self::analyze_single_pattern_predicate_kind(db, p, subject_ty))
|
||||
.unwrap_or(Truthiness::AlwaysTrue),
|
||||
PatternPredicateKind::Unsupported => Truthiness::Ambiguous,
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3584,7 +3584,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
|
|||
fn infer_nested_match_pattern(&mut self, pattern: &ast::Pattern) {
|
||||
match pattern {
|
||||
ast::Pattern::MatchValue(match_value) => {
|
||||
self.infer_expression(&match_value.value);
|
||||
self.infer_maybe_standalone_expression(&match_value.value);
|
||||
}
|
||||
ast::Pattern::MatchSequence(match_sequence) => {
|
||||
for pattern in &match_sequence.patterns {
|
||||
|
@ -3619,7 +3619,7 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
|
|||
for keyword in &arguments.keywords {
|
||||
self.infer_nested_match_pattern(&keyword.pattern);
|
||||
}
|
||||
self.infer_expression(cls);
|
||||
self.infer_maybe_standalone_expression(cls);
|
||||
}
|
||||
ast::Pattern::MatchAs(match_as) => {
|
||||
if let Some(pattern) = &match_as.pattern {
|
||||
|
|
|
@ -410,6 +410,9 @@ impl<'db, 'ast> NarrowingConstraintsBuilder<'db, 'ast> {
|
|||
PatternPredicateKind::Or(predicates) => {
|
||||
self.evaluate_match_pattern_or(subject, predicates, is_positive)
|
||||
}
|
||||
PatternPredicateKind::As(pattern, _) => pattern
|
||||
.as_deref()
|
||||
.and_then(|p| self.evaluate_pattern_predicate_kind(p, subject, is_positive)),
|
||||
PatternPredicateKind::Unsupported => None,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue