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

Do not add parens around exprs if they are not needed in formatting

Browse source
This commit is contained in:
Chadtech 2021-10-16 13:30:32 -04:00
parent 8a4975ee8a
commit 2ca9dad156
3 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/fmt/src/annotation.rs
View file

@ -18,7 +18,7 @@ use roc_region::all::Located;
/// Just (Just a)
/// List (List a)
/// reverse (reverse l)
#[derive(PartialEq, Eq, Clone, Copy)]
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
pub enum Parens {
NotNeeded,
InFunctionType,

4
compiler/fmt/src/expr.rs
View file

@ -133,10 +133,14 @@ impl<'a> Formattable<'a> for Expr<'a> {
}
}
ParensAround(sub_expr) => {
if parens == Parens::NotNeeded {
sub_expr.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, indent);
} else {
buf.push('(');
sub_expr.format_with_options(buf, Parens::NotNeeded, Newlines::Yes, indent);
buf.push(')');
}
}
Str(literal) => {
use roc_parse::ast::StrLiteral::*;

25
compiler/fmt/tests/test_fmt.rs
View file

@ -362,6 +362,31 @@ mod test_fmt {
);
}
#[test]
fn excess_parens() {
expr_formats_to(
indoc!(
r#"
x = (5)
y = ((10))
42
"#
),
indoc!(
r#"
x = 5
y = 10
42
"#
),
);
}
// #[test]
// fn defs_with_defs() {
// expr_formats_to(