diff --git a/src/rules/paren.rs b/src/rules/paren.rs index 365e180..e96ea0e 100644 --- a/src/rules/paren.rs +++ b/src/rules/paren.rs @@ -8,7 +8,10 @@ pub fn rule( build_ctx, node, true, ); - let layout = if children.has_comments() || children.has_newlines() { + let has_comments_or_newlines = + children.has_comments() || children.has_newlines(); + + let layout = if has_comments_or_newlines { &crate::config::Layout::Tall } else { build_ctx.config.layout() @@ -19,7 +22,9 @@ pub fn rule( steps.push_back(crate::builder::Step::Format(child.element)); match layout { crate::config::Layout::Tall => { - steps.push_back(crate::builder::Step::Indent); + if has_comments_or_newlines { + steps.push_back(crate::builder::Step::Indent); + } } crate::config::Layout::Wide => {} } @@ -38,8 +43,10 @@ pub fn rule( let child = children.get_next().unwrap(); match layout { crate::config::Layout::Tall => { - steps.push_back(crate::builder::Step::NewLine); - steps.push_back(crate::builder::Step::Pad); + if has_comments_or_newlines { + steps.push_back(crate::builder::Step::NewLine); + steps.push_back(crate::builder::Step::Pad); + } steps.push_back(crate::builder::Step::FormatWider(child.element)); } crate::config::Layout::Wide => { @@ -61,9 +68,11 @@ pub fn rule( let child = children.get_next().unwrap(); match layout { crate::config::Layout::Tall => { - steps.push_back(crate::builder::Step::Dedent); - steps.push_back(crate::builder::Step::NewLine); - steps.push_back(crate::builder::Step::Pad); + if has_comments_or_newlines { + steps.push_back(crate::builder::Step::Dedent); + steps.push_back(crate::builder::Step::NewLine); + steps.push_back(crate::builder::Step::Pad); + } } crate::config::Layout::Wide => {} } diff --git a/tests/cases/apply/out b/tests/cases/apply/out index 9a786b8..3578271 100644 --- a/tests/cases/apply/out +++ b/tests/cases/apply/out @@ -1,12 +1,10 @@ (a b) (a b) -( - a - /* - b - */ - c -) +(a +/* + b + */ +c) ( /* a diff --git a/tests/cases/assert/out b/tests/cases/assert/out index 2366343..d85afa1 100644 --- a/tests/cases/assert/out +++ b/tests/cases/assert/out @@ -1,30 +1,24 @@ [ (assert b; c) - ( - assert b; - /* - b - */ - c - ) - ( - assert - /* - a - */ - b; c - ) - ( - assert - /* - a - */ - b; - /* - b - */ - c - ) + (assert b; + /* + b + */ + c) + (assert + /* + a + */ + b; c) + (assert + /* + a + */ + b; + /* + b + */ + c) (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) ] diff --git a/tests/cases/bin_op/out b/tests/cases/bin_op/out index 5f698cd..f9b7725 100644 --- a/tests/cases/bin_op/out +++ b/tests/cases/bin_op/out @@ -1,63 +1,49 @@ [ (1 + 1) - ( - 1 - + - /**/ - 1 - ) - ( - 1 - /**/ - + 1 - ) - ( - 1 - /**/ - + - /**/ - 1 - ) - ( - 1 - /**/ - + - /**/ - ( - 1 - /**/ - + - /**/ - ( - 1 - /**/ - + - /**/ - 1 - ) - ) - ) + (1 + + + /**/ + 1) + (1 + /**/ + + 1) + (1 + /**/ + + + /**/ + 1) + (1 + /**/ + + + /**/ + (1 + /**/ + + + /**/ + (1 + /**/ + + + /**/ + 1))) (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1) - ( - 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - + 1 - ) + (1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1 + + 1) ] diff --git a/tests/cases/comment/out b/tests/cases/comment/out index 9900c8e..b33ef4a 100644 --- a/tests/cases/comment/out +++ b/tests/cases/comment/out @@ -81,30 +81,26 @@ #7 } - ( - let - # 1 - #2 - a = 1; # 3 - b = 1; - c = 1; # 4 - #5 + (let + # 1 + #2 + a = 1; # 3 + b = 1; + c = 1; # 4 + #5 - #6 + #6 - d = 1; - #7 - in - d - ) + d = 1; + #7 + in + d) - ( - { - a, - # comment - b ? 2, - # comment - }: - _ - ) + ({ + a, + # comment + b ? 2, + # comment + }: + _) ] diff --git a/tests/cases/if_else/out b/tests/cases/if_else/out index f72ccfc..2e2d1fb 100644 --- a/tests/cases/if_else/out +++ b/tests/cases/if_else/out @@ -1,248 +1,160 @@ [ - ( - if ./a + (if ./a + then b + else c) + (if + /**/ + a + /**/ + then + /**/ + b + /**/ + else + /**/ + c) + (if + if a then b else c - ) - ( - if - /**/ - a - /**/ - then - /**/ - b - /**/ - else - /**/ - c - ) - ( - if - if a - then b - else c - then b - else if a - then b - else if a + then b + else if a + then b + else if a + then b + else c) + (if + if a then b else c - ) - ( - if - if a - then b - else c + then b + else if a + then b + else + /* + x + */ + if a then b - else if a - then b - else - /* - x - */ - if a - then b - else c - ) - ( - if - ( - if - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - then - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - else - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - ) + else c) + (if + (if + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) then - ( - if - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - then - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - else - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - ) + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) else - ( - if - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - then - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - else - ( - if - ( - if a - then b - else c - ) - then - ( - if a - then b - else c - ) - else - ( - if a - then b - else c - ) - ) - ) - ) + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c))) + then + (if + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) + then + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) + else + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c))) + else + (if + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) + then + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)) + else + (if + (if a + then b + else c) + then + (if a + then b + else c) + else + (if a + then b + else c)))) ] diff --git a/tests/cases/lambda/out b/tests/cases/lambda/out index 17a06a9..696fe53 100644 --- a/tests/cases/lambda/out +++ b/tests/cases/lambda/out @@ -1,71 +1,55 @@ [ - ( - a: b: + (a: b: + /* + c + */ + d) + ({}: + b: /* c */ - d - ) - ( + d) + (a: {}: - b: - /* - c - */ - d - ) - ( - a: - {}: - /* - c - */ - d - ) + /* + c + */ + d) (a: d) - ( - a: - /* - c - */ - d - ) - ( - a - /* - b - */ - : - d - ) - ( - a - /* - b - */ - : - /* - c - */ - d - ) + (a: + /* + c + */ + d) + (a + /* + b + */ + : + d) + (a + /* + b + */ + : + /* + c + */ + d) ( aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ) ( aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ) - ( - { - pkgs ? import ./.. {}, - locationsXml, - }: - null - ) - ( - a: b: c: - {}: - a: b: c: - a - ) + ({ + pkgs ? import ./.. {}, + locationsXml, + }: + null) + (a: b: c: + {}: + a: b: c: + a) ] diff --git a/tests/cases/or_default/out b/tests/cases/or_default/out index f762f18..b5f8ffa 100644 --- a/tests/cases/or_default/out +++ b/tests/cases/or_default/out @@ -1,67 +1,47 @@ [ (a or a) - ( - a - or - /**/ - a - ) - ( - a - /**/ - or a - ) - ( - a - /**/ - or - /**/ - a - ) - ( - a - /**/ - or - /**/ - ( - a - /**/ - or - /**/ - ( - a - /**/ - or - /**/ - a - ) - ) - ) - ( - a - /**/ - or - /**/ - ( - a - /**/ - or - /**/ - ( - a - /**/ - or - /**/ - a - ) - ) - ) + (a + or + /**/ + a) + (a + /**/ + or a) + (a + /**/ + or + /**/ + a) + (a + /**/ + or + /**/ + (a + /**/ + or + /**/ + (a + /**/ + or + /**/ + a))) + (a + /**/ + or + /**/ + (a + /**/ + or + /**/ + (a + /**/ + or + /**/ + a))) (a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a) - ( - a - or a - or a - or a - or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a - ) + (a + or a + or a + or a + or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a or a) ] diff --git a/tests/cases/paren/out b/tests/cases/paren/out index e8be796..1074504 100644 --- a/tests/cases/paren/out +++ b/tests/cases/paren/out @@ -6,14 +6,12 @@ e */ ) - ( - ( - c - /* - d - */ - ) - ) + (( + c + /* + d + */ + )) ( ( c @@ -25,14 +23,12 @@ e */ ) - ( - ( - /* - b - */ - c - ) - ) + (( + /* + b + */ + c + )) ( ( /* @@ -44,17 +40,15 @@ e */ ) - ( - ( - /* - b - */ - c - /* - d - */ - ) - ) + (( + /* + b + */ + c + /* + d + */ + )) ( ( /* diff --git a/tests/cases/pat_bind/out b/tests/cases/pat_bind/out index ab77d04..d4480db 100644 --- a/tests/cases/pat_bind/out +++ b/tests/cases/pat_bind/out @@ -1,45 +1,33 @@ [ ({} @ a: _) - ( - {} @ - /**/ - a: - _ - ) - ( - {} - /**/ - @ a: - _ - ) - ( - {} - /**/ - @ - /**/ - a: - _ - ) + ({} @ + /**/ + a: + _) + ({} + /**/ + @ a: + _) + ({} + /**/ + @ + /**/ + a: + _) (a @ {}: _) - ( - a @ - /**/ - {}: - _ - ) - ( - a - /**/ - @ {}: - _ - ) - ( - a - /**/ - @ - /**/ - {}: - _ - ) + (a @ + /**/ + {}: + _) + (a + /**/ + @ {}: + _) + (a + /**/ + @ + /**/ + {}: + _) ] diff --git a/tests/cases/pattern/out b/tests/cases/pattern/out index 4b6e84f..1f1d57c 100644 --- a/tests/cases/pattern/out +++ b/tests/cases/pattern/out @@ -1,1242 +1,1102 @@ [ - ( - { - self, - gomod2nix, - mach-nix, - } - @ inp: - _ - ) + ({ + self, + gomod2nix, + mach-nix, + } + @ inp: + _) ({}: _) ({ a }: _) - ( - { - /**/ - }: - _ - ) + ({ + /**/ + }: + _) ({ ... }: _) - ( - { ... - /**/ - }: - _ - ) - ( - { - /**/ - ... - }: - _ - ) - ( - { - /**/ - ... - /**/ - }: - _ - ) + ({ ... + /**/ + }: + _) + ({ + /**/ + ... + }: + _) + ({ + /**/ + ... + /**/ + }: + _) - ( - { - b, - e, - ... - }: - _ - ) - ( - { - b, - e, - ... - /* - h - */ - }: - _ - ) - ( - { - b, - e, - /* - g - */ - ... - }: - _ - ) - ( - { - b, - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b, - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - b, - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - b, - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - b, - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b, - /* - d - */ - e, - ... - }: - _ - ) - ( - { - b, - /* - d - */ - e, - ... - /* - h - */ - }: - _ - ) - ( - { - b, - /* - d - */ - e, - /* - g - */ - ... - }: - _ - ) - ( - { - b, - /* - d - */ - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b, - /* - d - */ - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - b, - /* - d - */ - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - b, - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - b, - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - e, - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - e, - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - e, - /* - g - */ - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e, - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e, - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e, - /* - g - */ - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - e, - ... - }: - _ - ) - ( - { - /* - a - */ - b, - e, - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - e, - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b, - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - /* - a - */ - b, - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b, - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e, - ... - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e, - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e, - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b, - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e, - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e, - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e, - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e, - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e, - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e, - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e, - /* - g - */ - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - ... - /* - h - */ - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - }: - _ - ) - ( - { - /* - a - */ - b - /* - c - */ - , - /* - d - */ - e - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) + ({ + b, + e, + ... + }: + _) + ({ + b, + e, + ... + /* + h + */ + }: + _) + ({ + b, + e, + /* + g + */ + ... + }: + _) + ({ + b, + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b, + e + /* + f + */ + , + ... + }: + _) + ({ + b, + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + b, + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + b, + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b, + /* + d + */ + e, + ... + }: + _) + ({ + b, + /* + d + */ + e, + ... + /* + h + */ + }: + _) + ({ + b, + /* + d + */ + e, + /* + g + */ + ... + }: + _) + ({ + b, + /* + d + */ + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b, + /* + d + */ + e + /* + f + */ + , + ... + }: + _) + ({ + b, + /* + d + */ + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + b, + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + b, + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + e, + ... + }: + _) + ({ + b + /* + c + */ + , + e, + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + e, + /* + g + */ + ... + }: + _) + ({ + b + /* + c + */ + , + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + e + /* + f + */ + , + ... + }: + _) + ({ + b + /* + c + */ + , + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + b + /* + c + */ + , + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e, + ... + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e, + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e, + /* + g + */ + ... + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + ... + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + e, + ... + }: + _) + ({ + /* + a + */ + b, + e, + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + e, + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b, + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + e + /* + f + */ + , + ... + }: + _) + ({ + /* + a + */ + b, + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b, + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e, + ... + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e, + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e, + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e + /* + f + */ + , + ... + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b, + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e, + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e, + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e, + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e + /* + f + */ + , + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e, + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e, + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e, + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e, + /* + g + */ + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + ... + /* + h + */ + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + }: + _) + ({ + /* + a + */ + b + /* + c + */ + , + /* + d + */ + e + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) ({ a ? null }: _) - ( - { - /* - a - */ - b - /* - a - */ - ? - /* - a - */ - null - /* - c - */ - , - /* - d - */ - e - /* - a - */ - ? - /* - a - */ - null - /* - f - */ - , - /* - g - */ - ... - /* - h - */ - }: - _ - ) + ({ + /* + a + */ + b + /* + a + */ + ? + /* + a + */ + null + /* + c + */ + , + /* + d + */ + e + /* + a + */ + ? + /* + a + */ + null + /* + f + */ + , + /* + g + */ + ... + /* + h + */ + }: + _) ( { diff --git a/tests/cases/select/out b/tests/cases/select/out index 865e8be..0769042 100644 --- a/tests/cases/select/out +++ b/tests/cases/select/out @@ -1,63 +1,55 @@ [ (a.a) - ( - a - . - /**/ - a - ) - ( - a - /**/ - .a - ) - ( - a - /**/ - . - /**/ - a - ) + (a + . + /**/ + a) + (a + /**/ + .a) + (a + /**/ + . + /**/ + a) (a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a) - ( - a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - .a - ) + (a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a + .a) ] diff --git a/tests/cases/with/out b/tests/cases/with/out index bd5a137..b1bb4fd 100644 --- a/tests/cases/with/out +++ b/tests/cases/with/out @@ -1,30 +1,24 @@ [ (with b; c) - ( - with b; - /* - b - */ - c - ) - ( - with - /* - a - */ - b; c - ) - ( - with - /* - a - */ - b; - /* - b - */ - c - ) + (with b; + /* + b + */ + c) + (with + /* + a + */ + b; c) + (with + /* + a + */ + b; + /* + b + */ + c) (with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) (with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc) { a = with b; 1; } @@ -47,25 +41,21 @@ # comment } (with a; with b; with c; { a = 1; }) - ( - with a; - with b; - with c; { - a = 1; - b = 2; - } - ) - ( - with a; - /* - comment - */ - with b; - with c; { - a = 1; - b = 2; - } - ) + (with a; + with b; + with c; { + a = 1; + b = 2; + }) + (with a; + /* + comment + */ + with b; + with c; { + a = 1; + b = 2; + }) { a = with b; with b; with b; 1; }