Skip to content

[ty] Simplify KnownClass::check_call() and KnownFunction::check_call() #18981

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 27, 2025
Merged

[ty] Simplify KnownClass::check_call() and KnownFunction::check_call() #18981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
107 changes: 46 additions & 61 deletions crates/ty_python_semantic/src/types/class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3201,16 +3201,16 @@ impl KnownClass {
}
}

/// Evaluate a call to this known class, and emit any diagnostics that are necessary
/// as a result of the call.
/// Evaluate a call to this known class, emit any diagnostics that are necessary
/// as a result of the call, and return the type that results from the call.
pub(super) fn check_call<'db>(
self,
context: &InferContext<'db, '_>,
index: &SemanticIndex<'db>,
overload_binding: &mut Binding<'db>,
overload_binding: &Binding<'db>,
call_argument_types: &CallArgumentTypes<'_, 'db>,
call_expression: &ast::ExprCall,
) {
) -> Option<Type<'db>> {
let db = context.db();
let scope = context.scope();
let module = context.module();
Expand All @@ -3226,10 +3226,9 @@ impl KnownClass {
let Some(enclosing_class) =
nearest_enclosing_class(db, index, scope, module)
else {
overload_binding.set_return_type(Type::unknown());
BoundSuperError::UnavailableImplicitArguments
.report_diagnostic(context, call_expression.into());
return;
return Some(Type::unknown());
};

// The type of the first parameter if the given scope is function-like (i.e. function or lambda).
Expand All @@ -3249,10 +3248,9 @@ impl KnownClass {
};

let Some(first_param) = first_param else {
overload_binding.set_return_type(Type::unknown());
BoundSuperError::UnavailableImplicitArguments
.report_diagnostic(context, call_expression.into());
return;
return Some(Type::unknown());
};

let definition = index.expect_single_definition(first_param);
Expand All @@ -3269,7 +3267,7 @@ impl KnownClass {
Type::unknown()
});

overload_binding.set_return_type(bound_super);
Some(bound_super)
}
[Some(pivot_class_type), Some(owner_type)] => {
let bound_super = BoundSuperType::build(db, *pivot_class_type, *owner_type)
Expand All @@ -3278,9 +3276,9 @@ impl KnownClass {
Type::unknown()
});

overload_binding.set_return_type(bound_super);
Some(bound_super)
}
_ => {}
_ => None,
}
}

Expand All @@ -3295,14 +3293,12 @@ impl KnownClass {
_ => None,
}
}) else {
if let Some(builder) =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
{
builder.into_diagnostic(
"A legacy `typing.TypeVar` must be immediately assigned to a variable",
);
}
return;
let builder =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)?;
builder.into_diagnostic(
"A legacy `typing.TypeVar` must be immediately assigned to a variable",
);
return None;
};

let [
Expand All @@ -3315,7 +3311,7 @@ impl KnownClass {
_infer_variance,
] = overload_binding.parameter_types()
else {
return;
return None;
};

let covariant = covariant
Expand All @@ -3328,39 +3324,30 @@ impl KnownClass {

let variance = match (contravariant, covariant) {
(Truthiness::Ambiguous, _) => {
let Some(builder) =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
else {
return;
};
let builder =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)?;
builder.into_diagnostic(
"The `contravariant` parameter of a legacy `typing.TypeVar` \
cannot have an ambiguous value",
);
return;
return None;
}
(_, Truthiness::Ambiguous) => {
let Some(builder) =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
else {
return;
};
let builder =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)?;
builder.into_diagnostic(
"The `covariant` parameter of a legacy `typing.TypeVar` \
cannot have an ambiguous value",
);
return;
return None;
}
(Truthiness::AlwaysTrue, Truthiness::AlwaysTrue) => {
let Some(builder) =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
else {
return;
};
let builder =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)?;
builder.into_diagnostic(
"A legacy `typing.TypeVar` cannot be both covariant and contravariant",
);
return;
return None;
}
(Truthiness::AlwaysTrue, Truthiness::AlwaysFalse) => {
TypeVarVariance::Contravariant
Expand All @@ -3374,11 +3361,8 @@ impl KnownClass {
let name_param = name_param.into_string_literal().map(|name| name.value(db));

if name_param.is_none_or(|name_param| name_param != target.id) {
let Some(builder) =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)
else {
return;
};
let builder =
context.report_lint(&INVALID_LEGACY_TYPE_VARIABLE, call_expression)?;
builder.into_diagnostic(format_args!(
"The name of a legacy `typing.TypeVar`{} must match \
the name of the variable it is assigned to (`{}`)",
Expand All @@ -3389,7 +3373,7 @@ impl KnownClass {
},
target.id,
));
return;
return None;
}

let bound_or_constraint = match (bound, constraints) {
Expand All @@ -3414,13 +3398,13 @@ impl KnownClass {

// TODO: Emit a diagnostic that TypeVar cannot be both bounded and
// constrained
(Some(_), Some(_)) => return,
(Some(_), Some(_)) => return None,

(None, None) => None,
};

let containing_assignment = index.expect_single_definition(target);
overload_binding.set_return_type(Type::KnownInstance(KnownInstanceType::TypeVar(
Some(Type::KnownInstance(KnownInstanceType::TypeVar(
TypeVarInstance::new(
db,
target.id.clone(),
Expand All @@ -3430,7 +3414,7 @@ impl KnownClass {
*default,
TypeVarKind::Legacy,
),
)));
)))
}

KnownClass::TypeAliasType => {
Expand All @@ -3446,30 +3430,31 @@ impl KnownClass {
});

let [Some(name), Some(value), ..] = overload_binding.parameter_types() else {
return;
return None;
};

if let Some(name) = name.into_string_literal() {
overload_binding.set_return_type(Type::KnownInstance(
KnownInstanceType::TypeAliasType(TypeAliasType::Bare(
name.into_string_literal()
.map(|name| {
Type::KnownInstance(KnownInstanceType::TypeAliasType(TypeAliasType::Bare(
BareTypeAliasType::new(
db,
ast::name::Name::new(name.value(db)),
containing_assignment,
value,
),
)),
));
} else if let Some(builder) =
context.report_lint(&INVALID_TYPE_ALIAS_TYPE, call_expression)
{
builder.into_diagnostic(
"The name of a `typing.TypeAlias` must be a string literal",
);
}
)))
})
.or_else(|| {
let builder =
context.report_lint(&INVALID_TYPE_ALIAS_TYPE, call_expression)?;
builder.into_diagnostic(
"The name of a `typing.TypeAlias` must be a string literal",
);
None
})
}

_ => {}
_ => None,
}
}
}
Expand Down
22 changes: 9 additions & 13 deletions crates/ty_python_semantic/src/types/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ use crate::types::generics::GenericContext;
use crate::types::narrow::ClassInfoConstraintFunction;
use crate::types::signatures::{CallableSignature, Signature};
use crate::types::{
Binding, BoundMethodType, CallableType, DynamicType, Type, TypeMapping, TypeRelation,
TypeVarInstance,
BoundMethodType, CallableType, DynamicType, Type, TypeMapping, TypeRelation, TypeVarInstance,
};
use crate::{Db, FxOrderSet};

Expand Down Expand Up @@ -963,14 +962,14 @@ impl KnownFunction {
pub(super) fn check_call(
self,
context: &InferContext,
overload_binding: &mut Binding,
parameter_types: &[Option<Type<'_>>],
call_expression: &ast::ExprCall,
) {
let db = context.db();

match self {
KnownFunction::RevealType => {
let [Some(revealed_type)] = overload_binding.parameter_types() else {
let [Some(revealed_type)] = parameter_types else {
return;
};
let Some(builder) =
Expand All @@ -986,8 +985,7 @@ impl KnownFunction {
);
}
KnownFunction::AssertType => {
let [Some(actual_ty), Some(asserted_ty)] = overload_binding.parameter_types()
else {
let [Some(actual_ty), Some(asserted_ty)] = parameter_types else {
return;
};

Expand Down Expand Up @@ -1019,7 +1017,7 @@ impl KnownFunction {
));
}
KnownFunction::AssertNever => {
let [Some(actual_ty)] = overload_binding.parameter_types() else {
let [Some(actual_ty)] = parameter_types else {
return;
};
if actual_ty.is_equivalent_to(db, Type::Never) {
Expand All @@ -1045,7 +1043,7 @@ impl KnownFunction {
));
}
KnownFunction::StaticAssert => {
let [Some(parameter_ty), message] = overload_binding.parameter_types() else {
let [Some(parameter_ty), message] = parameter_types else {
return;
};
let truthiness = match parameter_ty.try_bool(db) {
Expand Down Expand Up @@ -1100,8 +1098,7 @@ impl KnownFunction {
}
}
KnownFunction::Cast => {
let [Some(casted_type), Some(source_type)] = overload_binding.parameter_types()
else {
let [Some(casted_type), Some(source_type)] = parameter_types else {
return;
};
let contains_unknown_or_todo =
Expand All @@ -1121,7 +1118,7 @@ impl KnownFunction {
}
}
KnownFunction::GetProtocolMembers => {
let [Some(Type::ClassLiteral(class))] = overload_binding.parameter_types() else {
let [Some(Type::ClassLiteral(class))] = parameter_types else {
return;
};
if class.is_protocol(db) {
Expand All @@ -1130,8 +1127,7 @@ impl KnownFunction {
report_bad_argument_to_get_protocol_members(context, call_expression, *class);
}
KnownFunction::IsInstance | KnownFunction::IsSubclass => {
let [_, Some(Type::ClassLiteral(class))] = overload_binding.parameter_types()
else {
let [_, Some(Type::ClassLiteral(class))] = parameter_types else {
return;
};
let Some(protocol_class) = class.into_protocol_class(db) else {
Expand Down
11 changes: 9 additions & 2 deletions crates/ty_python_semantic/src/types/infer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5397,21 +5397,28 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
match binding_type {
Type::FunctionLiteral(function_literal) => {
if let Some(known_function) = function_literal.known(self.db()) {
known_function.check_call(&self.context, overload, call_expression);
known_function.check_call(
&self.context,
overload.parameter_types(),
call_expression,
);
}
}

Type::ClassLiteral(class) => {
let Some(known_class) = class.known(self.db()) else {
continue;
};
known_class.check_call(
let overridden_return = known_class.check_call(
&self.context,
self.index,
overload,
&call_argument_types,
call_expression,
);
if let Some(overridden_return) = overridden_return {
overload.set_return_type(overridden_return);
}
}
_ => {}
}
Expand Down
Loading