language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-09-30 12:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix type formatting

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-12-14 08:04:48 +09:00
parent 393ce2d94a
commit 8528096a31
2 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/erg_compiler/ty/free.rs
View file

@ -255,14 +255,18 @@ impl<T: LimitedDisplay> LimitedDisplay for FreeKind<T> {
constraint, constraint,
} => { } => {
if *lev == GENERIC_LEVEL { if *lev == GENERIC_LEVEL {
write!(f, "{name}(")?; write!(f, "{name}")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
} else {
write!(f, "?{name}(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
if cfg!(feature = "debug") { if cfg!(feature = "debug") {
write!(f, "(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
}
} else {
write!(f, "?{name}")?;
if cfg!(feature = "debug") {
write!(f, "(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
write!(f, "[{lev}]")?; write!(f, "[{lev}]")?;
} }
} }
@ -274,14 +278,18 @@ impl<T: LimitedDisplay> LimitedDisplay for FreeKind<T> {
constraint, constraint,
} => { } => {
if *lev == GENERIC_LEVEL { if *lev == GENERIC_LEVEL {
write!(f, "%{id}(")?; write!(f, "%{id}")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
} else {
write!(f, "?{id}(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
if cfg!(feature = "debug") { if cfg!(feature = "debug") {
write!(f, "(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
}
} else {
write!(f, "?{id}")?;
if cfg!(feature = "debug") {
write!(f, "(")?;
constraint.limited_fmt(f, limit - 1)?;
write!(f, ")")?;
write!(f, "[{lev}]")?; write!(f, "[{lev}]")?;
} }
} }

2
compiler/erg_compiler/ty/mod.rs
View file

@ -1192,7 +1192,7 @@ impl LimitedDisplay for Type {
write!(f, "|")?; write!(f, "|")?;
for (i, (name, constr)) in qvars.iter().enumerate() { for (i, (name, constr)) in qvars.iter().enumerate() {
if i != 0 { if i != 0 {
write!(f, "; ")?; write!(f, ", ")?;
} }
write!(f, "{name}")?; write!(f, "{name}")?;
constr.limited_fmt(f, limit - 1)?; constr.limited_fmt(f, limit - 1)?;