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

Fix expr_lift_spaces of Closure

Browse source
This commit is contained in:
Joshua Warner 2024-12-02 18:24:54 -08:00
parent 19f8cc532a
commit cae47cf2a6
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/compiler/fmt/src/expr.rs
View file

@ -999,10 +999,24 @@ pub fn expr_lift_spaces<'a, 'b: 'a>(
after: final_expr_lifted.after,
}
}
Expr::If { .. } | Expr::When(_, _) | Expr::Return(_, _) | Expr::Closure(..) => {
let res = if parens == Parens::InApply
|| (parens == Parens::InApplyLastArg && !matches!(expr, Expr::Closure(..)))
{
Expr::Closure(pats, body) => {
if parens == Parens::InApply {
return Spaces {
before: &[],
item: Expr::ParensAround(arena.alloc(*expr)),
after: &[],
};
}
let body_lifted = expr_lift_spaces_after(Parens::NotNeeded, arena, &body.value);
Spaces {
before: &[],
item: Expr::Closure(pats, arena.alloc(Loc::at(body.region, body_lifted.item))),
after: body_lifted.after,
}
}
Expr::If { .. } | Expr::When(_, _) | Expr::Return(_, _) => {
if parens == Parens::InApply || parens == Parens::InApplyLastArg {
Spaces {
before: &[],
item: Expr::ParensAround(arena.alloc(*expr)),
@ -1014,8 +1028,7 @@ pub fn expr_lift_spaces<'a, 'b: 'a>(
item: *expr,
after: &[],
}
};
dbg!(res)
}
}
Expr::Backpassing(pats, call, continuation) => {
let pats = arena.alloc_slice_copy(pats);

1
crates/compiler/test_syntax/tests/snapshots/pass/capture_body_parens_comment.expr.formatted.roc Normal file
View file

@ -0,0 +1 @@
\L -> E #

25
crates/compiler/test_syntax/tests/snapshots/pass/capture_body_parens_comment.expr.result-ast Normal file
View file

@ -0,0 +1,25 @@
SpaceAfter(
Closure(
[
@1-2 Tag(
"L",
),
],
@4-10 ParensAround(
SpaceAfter(
Tag(
"E",
),
[
Newline,
LineComment(
"",
),
],
),
),
),
[
Newline,
],
)

3
crates/compiler/test_syntax/tests/snapshots/pass/capture_body_parens_comment.expr.roc Normal file
View file

@ -0,0 +1,3 @@
\L->(E
#
)

1
crates/compiler/test_syntax/tests/test_snapshots.rs
View file

@ -328,6 +328,7 @@ mod test_snapshots {
pass/body_with_unneeded_parens.expr,
pass/call_bang.expr,
pass/call_bang_no_space.expr,
pass/capture_body_parens_comment.expr,
pass/closure_in_apply_in_binop.expr,
pass/closure_in_binop_with_spaces.expr,
pass/closure_pat_reccord_comment.expr,