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

Don't drop spaces before return

Browse source
This commit is contained in:
Joshua Warner 2024-12-12 20:14:45 -08:00
parent 5a6e0f546b
commit 16c3d4e512
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
11 changed files with 217 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/compiler/parse/src/expr.rs
View file

@ -3107,13 +3107,23 @@ fn stmts_to_defs<'a>(
match sp_stmt.item.value {
Stmt::Expr(Expr::Return(return_value, _after_return)) => {
if i == stmts.len() - 1 {
last_expr = Some(Loc::at_zero(Expr::Return(return_value, None)));
let region = sp_stmt.item.region;
last_expr = Some(
arena
.alloc(Expr::Return(return_value, None))
.with_spaces_before(sp_stmt.before, region),
);
} else {
let region = Region::span_across(
&sp_stmt.item.region,
&stmts[stmts.len() - 1].item.region,
);
let rest = stmts_to_expr(&stmts[i + 1..], arena)?;
last_expr = Some(Loc::at_zero(Expr::Return(
return_value,
Some(arena.alloc(rest)),
)));
last_expr = Some(
arena
.alloc(Expr::Return(return_value, Some(arena.alloc(rest))))
.with_spaces_before(sp_stmt.before, region),
);
}
// don't re-process the rest of the statements, they got consumed by the early return