Skip to content

fix type parameter missing a * #3067 #3114

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

Open
asukaminato0721 wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −24
Open

fix type parameter missing a * #3067 #3114

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
62 changes: 38 additions & 24 deletions crates/pyrefly_types/src/display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,32 +237,33 @@ impl<'a> TypeDisplayContext<'a> {
}

fn fmt_targ(&self, param: &Quantified, arg: &Type, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if param.is_type_var_tuple()
&& let Type::Tuple(tuple) = arg
{
match tuple {
Tuple::Concrete(elts) if !elts.is_empty() => write!(
f,
"{}",
commas_iter(|| elts.iter().map(|elt| self.display_internal(elt)))
),
Tuple::Unpacked(box (prefix, middle, suffix)) => {
let unpacked_middle = Type::Unpack(Box::new(middle.clone()));
write!(
if param.is_type_var_tuple() {
match arg {
Type::Tuple(tuple) => match tuple {
Tuple::Concrete(elts) if !elts.is_empty() => write!(
f,
"{}",
commas_iter(|| {
prefix
.iter()
.chain(std::iter::once(&unpacked_middle))
.chain(suffix.iter())
.map(|elt| self.display_internal(elt))
})
)
}
_ => {
write!(f, "*{}", self.display_internal(arg))
}
commas_iter(|| elts.iter().map(|elt| self.display_internal(elt)))
),
Tuple::Unpacked(box (prefix, middle, suffix)) => {
let unpacked_middle = Type::Unpack(Box::new(middle.clone()));
write!(
f,
"{}",
commas_iter(|| {
prefix
.iter()
.chain(std::iter::once(&unpacked_middle))
.chain(suffix.iter())
.map(|elt| self.display_internal(elt))
})
)
}
_ => write!(f, "*{}", self.display_internal(arg)),
},
Type::Unpack(_) => write!(f, "{}", self.display_internal(arg)),
_ if arg.is_kind_type_var_tuple() => write!(f, "*{}", self.display_internal(arg)),
_ => write!(f, "{}", self.display_internal(arg)),
}
} else {
write!(f, "{}", self.display_internal(arg))
Expand Down Expand Up @@ -1546,6 +1547,19 @@ pub mod tests {
.to_string(),
"TupleParam[foo, *tuple[foo, ...], foo]"
);
let heap = TypeHeap::new();
let shape_param = fake_tparam(&uniques, "Shape", QuantifiedKind::TypeVarTuple);
assert_eq!(
class_type(
&tuple_param,
TArgs::new(
tuple_param_tparams.dupe(),
vec![shape_param.clone().to_type(&heap)]
)
)
.to_string(),
"TupleParam[*Shape]"
);

assert_eq!(
Type::unbounded_tuple(class_type(&foo1, TArgs::default())).to_string(),
Expand Down
Loading