language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-31 21:17:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix more cases of when in guard

Browse source
This commit is contained in:
Joshua Warner 2025-01-11 10:06:05 -08:00
parent 903b792fd3
commit 6b08f42d02
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
5 changed files with 99 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1779,6 +1779,8 @@ fn guard_needs_parens(value: &Expr<'_>) -> bool {
Expr::ParensAround(expr) | Expr::SpaceBefore(expr, _) | Expr::SpaceAfter(expr, _) => { Expr::ParensAround(expr) | Expr::SpaceBefore(expr, _) | Expr::SpaceAfter(expr, _) => {
guard_needs_parens(expr) guard_needs_parens(expr)
} }
Expr::Closure(_, body) => guard_needs_parens(&body.value),
Expr::Defs(_, final_expr) => guard_needs_parens(&final_expr.value),
_ => false, _ => false,
} }
} }

10
crates/compiler/test_syntax/tests/snapshots/pass/when_in_closure_in_when_guard_wtf.expr.formatted.roc Normal file
View file

@ -0,0 +1,10 @@
when
f
is
s if (\t ->
when
0
is
z ->
f
z) -> m

81
crates/compiler/test_syntax/tests/snapshots/pass/when_in_closure_in_when_guard_wtf.expr.result-ast Normal file
View file

@ -0,0 +1,81 @@
@0-38 SpaceAfter(
When(
@5-6 SpaceAfter(
Var {
module_name: "",
ident: "f",
},
[
Newline,
],
),
[
WhenBranch {
patterns: [
@10-11 SpaceBefore(
Identifier {
ident: "s",
},
[
Newline,
],
),
],
value: @37-38 Var {
module_name: "",
ident: "m",
},
guard: Some(
@14-35 Closure(
[
@15-16 Identifier {
ident: "t",
},
],
@18-35 When(
@23-24 SpaceAfter(
Num(
"0",
),
[
Newline,
],
),
[
WhenBranch {
patterns: [
@28-29 Identifier {
ident: "z",
},
],
value: @31-35 Apply(
@31-32 Var {
module_name: "",
ident: "f",
},
[
@34-35 SpaceBefore(
Var {
module_name: "",
ident: "z",
},
[
Newline,
],
),
],
Space,
),
guard: None,
},
],
),
),
),
},
],
),
[
Newline,
],
)

5
crates/compiler/test_syntax/tests/snapshots/pass/when_in_closure_in_when_guard_wtf.expr.roc Normal file
View file

@ -0,0 +1,5 @@
when f
is
s if\t->when 0
is z->f
z->m

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

@ -759,6 +759,7 @@ mod test_snapshots {
pass/when_if_guard.expr, pass/when_if_guard.expr,
pass/when_in_assignment.expr, pass/when_in_assignment.expr,
pass/when_in_binops.expr, pass/when_in_binops.expr,
pass/when_in_closure_in_when_guard_wtf.expr,
pass/when_in_function.expr, pass/when_in_function.expr,
pass/when_in_function_python_style_indent.expr, pass/when_in_function_python_style_indent.expr,
pass/when_in_list.expr, pass/when_in_list.expr,