language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-01 19:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Improve pretty printing of derived impls

Browse source
This commit is contained in:
Ayaz Hafiz 2022-07-13 14:03:37 -04:00
parent c647973dee
commit e3742481f4
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

43
crates/compiler/test_derive/src/encoding.rs
View file

@ -530,8 +530,9 @@ fn empty_record() {
# @<2>: [[custom(2) {}]]
#Derived.toEncoder_{} =
\#Derived.rcd ->
Encode.custom \#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.record []) #Derived.fmt
Encode.custom
\#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.record []) #Derived.fmt
"###
)
})
@ -549,8 +550,9 @@ fn zero_field_record() {
# @<2>: [[custom(2) {}]]
#Derived.toEncoder_{} =
\#Derived.rcd ->
Encode.custom \#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.record []) #Derived.fmt
Encode.custom
\#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.record []) #Derived.fmt
"###
)
})
@ -568,10 +570,15 @@ fn one_field_record() {
# @<2>: [[custom(2) { a : val }]] | val has Encoding
#Derived.toEncoder_{a} =
\#Derived.rcd ->
Encode.custom \#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.record [
{ value: Encode.toEncoder #Derived.rcd.a, key: "a", },
]) #Derived.fmt
Encode.custom
\#Derived.bytes, #Derived.fmt ->
Encode.appendWith
#Derived.bytes
(Encode.record
[
{ value: Encode.toEncoder #Derived.rcd.a, key: "a", },
])
#Derived.fmt
"###
)
})
@ -625,9 +632,12 @@ fn tag_one_label_zero_args() {
# @<2>: [[custom(2) [A]]]
#Derived.toEncoder_[A 0] =
\#Derived.tag ->
Encode.custom \#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (when #Derived.tag is
A -> Encode.tag "A" []) #Derived.fmt
Encode.custom
\#Derived.bytes, #Derived.fmt ->
Encode.appendWith
#Derived.bytes
(when #Derived.tag is A -> Encode.tag "A" [])
#Derived.fmt
"###
)
})
@ -724,9 +734,14 @@ fn list() {
# @<2>: [[custom(4) (List val)]] | val has Encoding
#Derived.toEncoder_list =
\#Derived.lst ->
Encode.custom \#Derived.bytes, #Derived.fmt ->
Encode.appendWith #Derived.bytes (Encode.list #Derived.lst
\#Derived.elem -> Encode.toEncoder #Derived.elem) #Derived.fmt
Encode.custom
\#Derived.bytes, #Derived.fmt ->
Encode.appendWith
#Derived.bytes
(Encode.list
#Derived.lst
\#Derived.elem -> Encode.toEncoder #Derived.elem)
#Derived.fmt
"###
)
})

15
crates/compiler/test_derive/src/pretty_print.rs
View file

@ -138,12 +138,17 @@ fn expr<'a>(c: &Ctx, p: EPrec, f: &'a Arena<'a>, e: &'a Expr) -> DocBuilder<'a,
Free,
p,
expr(c, CallArg, f, &fun.value)
.append(f.softline())
.append(f.intersperse(
args.iter().map(|le| expr(c, CallArg, f, &le.1.value)),
f.softline()
))
.append(
f.concat(args.iter().map(|le| f.line().append(expr(
c,
CallArg,
f,
&le.1.value
))))
.group()
)
.group()
.nest(2)
)
}
RunLowLevel { .. } => todo!(),