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

update the generic context too

This commit is contained in:
Douglas Creager 2025-12-02 17:22:39 -05:00
parent dc21c3b728
commit 564a8dc6b2
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ty_python_semantic/src/types/function.rs
View File

@ -509,7 +509,7 @@ impl<'db> OverloadLiteral<'db> {
);
let generic_context = raw_signature.generic_context;
raw_signature.add_implicit_self_annotation(|| {
raw_signature.add_implicit_self_annotation(db, || {
if self.is_staticmethod(db) || self.is_classmethod(db) {
return None;
}

26
crates/ty_python_semantic/src/types/signatures.rs
View File

@ -690,6 +690,7 @@ impl<'db> Signature<'db> {
/// annotation.
pub(crate) fn add_implicit_self_annotation(
&mut self,
db: &'db dyn Db,
self_type: impl FnOnce() -> Option<Type<'db>>,
) {
if let Some(first_parameter) = self.parameters.value.first_mut()
@ -699,6 +700,31 @@ impl<'db> Signature<'db> {
{
first_parameter.annotated_type = Some(self_type);
first_parameter.inferred_annotation = true;
// If we've added an implicit `self` annotation, we might need to update the
// signature's generic context, too. (The generic context should include any synthetic
// typevars created for `typing.Self`, even if the `typing.Self` annotation was added
// implicitly.)
if let Type::TypeVar(self_typevar) = self_type {
match self.generic_context.as_mut() {
Some(generic_context)
if generic_context
.binds_typevar(db, self_typevar.typevar(db))
.is_some() => {}
Some(generic_context) => {
*generic_context = GenericContext::from_typevar_instances(
db,
std::iter::once(self_typevar).chain(generic_context.variables(db)),
);
}
None => {
self.generic_context = Some(GenericContext::from_typevar_instances(
db,
std::iter::once(self_typevar),
));
}
}
}
}
}