Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

type-params is a scope, not a definition

This commit is contained in:
Douglas Creager 2025-12-05 11:51:48 -05:00
parent 2f00ce8834
commit 919941ff59
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ty_python_semantic/src/types/infer.rs
View File

@ -547,6 +547,12 @@ struct ScopeInferenceExtra<'db> {
/// The diagnostics for this region.
diagnostics: TypeCheckDiagnostics,
/// The parameters of a function definition (without any default values filled in).
parameters: Option<Vec<Parameter<'db>>>,
/// The return type of a function definition.
return_type: Option<Type<'db>>,
}
impl<'db> ScopeInference<'db> {

29
crates/ty_python_semantic/src/types/infer/builder.rs
View File

@ -12347,17 +12347,17 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
mut expressions,
scope,
cycle_recovery,
parameters,
return_type,
// Ignored, because scope types are never extended into other scopes.
deferred: _,
bindings: _,
declarations: _,
parameter_defaults: _,
// Ignored; only relevant to definition regions
undecorated_type: _,
parameters: _,
parameter_defaults: _,
return_type: _,
// Builder only state
dataclass_field_specifiers: _,
@ -12375,15 +12375,20 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
let _ = scope;
let diagnostics = context.finish();
let extra =
(!string_annotations.is_empty() || !diagnostics.is_empty() || cycle_recovery.is_some())
.then(|| {
Box::new(ScopeInferenceExtra {
string_annotations,
cycle_recovery,
diagnostics,
})
});
let extra = (!string_annotations.is_empty()
|| !diagnostics.is_empty()
|| cycle_recovery.is_some()
|| parameters.is_some()
|| return_type.is_some())
.then(|| {
Box::new(ScopeInferenceExtra {
string_annotations,
cycle_recovery,
diagnostics,
parameters,
return_type,
})
});
expressions.shrink_to_fit();