Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 15 additions & 6 deletions pyrefly/lib/alt/class/new_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,21 @@ use crate::types::class::Class;
use crate::types::types::Type;

impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
fn new_type_base_type(&self, cls: &Class, base: &Class) -> Type {
let class_bases = self.get_base_types_for_class(cls);
if let Some(tuple_base) = class_bases.tuple_base() {
return Type::Tuple(tuple_base.clone());
}
let mut base_iter = class_bases.iter();
if let Some(base_class_type) = base_iter.next().cloned() {
return Type::ClassType(base_class_type);
}
self.promote_nontypeddict_silently_to_classtype(base)
.to_type()
}

fn get_new_type_init(&self, cls: &Class, base: Class) -> ClassSynthesizedField {
let base_type = self
.promote_nontypeddict_silently_to_classtype(&base)
.to_type();
let base_type = self.new_type_base_type(cls, &base);
let params = vec![
self.class_self_param(cls, false),
Param::Pos(Name::new_static("_x"), base_type, Required::Required),
Expand All @@ -39,9 +50,7 @@ impl<'a, Ans: LookupAnswer> AnswersSolver<'a, Ans> {
}

fn get_new_type_new(&self, cls: &Class, base: Class) -> ClassSynthesizedField {
let base_type = self
.promote_nontypeddict_silently_to_classtype(&base)
.to_type();
let base_type = self.new_type_base_type(cls, &base);
let params = vec![
Param::Pos(
Name::new_static("cls"),
Expand Down
2 changes: 1 addition & 1 deletion pyrefly/lib/test/new_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Foo = NewType("Foo", tuple[int, int])
Bar = NewType("Bar", tuple[int, ...])

Foo((1, 2)) # OK
Foo((1, 2, 3)) # this shouldn't be allowed
Foo((1, 2, 3)) # E: Argument `tuple[Literal[1], Literal[2], Literal[3]]` is not assignable to parameter `_x` with type `tuple[int, int]` in function `Foo.__new__`
"#,
);

Expand Down