From b61724a5a481eee93fd3cb1e0737948d7b667de6 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 31 Jan 2022 20:48:27 -0500 Subject: [PATCH] feat: do not indent second bin op --- src/rules/select.rs | 3 -- tests/cases/dynamic/out | 22 +++++----- tests/cases/select/out | 94 ++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 61 deletions(-) diff --git a/src/rules/select.rs b/src/rules/select.rs index b16829e..912837d 100644 --- a/src/rules/select.rs +++ b/src/rules/select.rs @@ -18,12 +18,10 @@ pub fn rule( crate::config::Layout::Tall => match child.element.kind() { rnix::SyntaxKind::NODE_SELECT => { steps.push_back(crate::builder::Step::Format(child.element)); - steps.push_back(crate::builder::Step::Indent); steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } _ => { - steps.push_back(crate::builder::Step::Indent); steps.push_back(crate::builder::Step::FormatWider( child.element, )); @@ -66,7 +64,6 @@ pub fn rule( match layout { crate::config::Layout::Tall => { steps.push_back(crate::builder::Step::FormatWider(child.element)); - steps.push_back(crate::builder::Step::Dedent); } crate::config::Layout::Wide => { steps.push_back(crate::builder::Step::Format(child.element)); diff --git a/tests/cases/dynamic/out b/tests/cases/dynamic/out index 06a2923..6f74b7d 100644 --- a/tests/cases/dynamic/out +++ b/tests/cases/dynamic/out @@ -1,16 +1,16 @@ a +.${ + /* + b + */ + c .${ /* - b - */ - c - .${ - /* - d - */ - e.${ f } - } - /* - g + d */ + e.${ f } } + /* + g + */ +} diff --git a/tests/cases/select/out b/tests/cases/select/out index 1fb036e..865e8be 100644 --- a/tests/cases/select/out +++ b/tests/cases/select/out @@ -2,62 +2,62 @@ (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 ) ]