From 76e9af334d103145ce1940879a40ee3c2bf9a5f9 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Wed, 16 Feb 2022 20:02:57 -0500 Subject: [PATCH] feat: no extra space in attr-sets --- src/rules/attr_set.rs | 4 +++- tests/cases/attr_set/out | 4 ++-- tests/cases/key_value/out | 6 +++--- tests/cases/lambda/out | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/rules/attr_set.rs b/src/rules/attr_set.rs index 8b5dc2b..c268e55 100644 --- a/src/rules/attr_set.rs +++ b/src/rules/attr_set.rs @@ -127,7 +127,9 @@ pub fn rule( steps.push_back(crate::builder::Step::Pad); } crate::config::Layout::Wide => { - steps.push_back(crate::builder::Step::Whitespace); + if items_count > 0 { + steps.push_back(crate::builder::Step::Whitespace); + } } } steps.push_back(crate::builder::Step::Format(child.element)); diff --git a/tests/cases/attr_set/out b/tests/cases/attr_set/out index ab1c249..8383df3 100644 --- a/tests/cases/attr_set/out +++ b/tests/cases/attr_set/out @@ -1,5 +1,5 @@ [ - { } + {} { /* a @@ -101,7 +101,7 @@ a = { a = rec { a = { - a = rec { a = { a = rec { a = { a = rec { a = { }; }; }; }; }; }; + a = rec { a = { a = rec { a = { a = rec { a = {}; }; }; }; }; }; }; }; }; diff --git a/tests/cases/key_value/out b/tests/cases/key_value/out index f6b348a..a13d348 100644 --- a/tests/cases/key_value/out +++ b/tests/cases/key_value/out @@ -94,13 +94,13 @@ rec b = 1; c = 2; }; - n = pkgs: { }; + n = pkgs: {}; o = { pkgs, ... }: - { }; + {}; a /* @@ -117,6 +117,6 @@ rec ; p = - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa { } + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa {} a; } diff --git a/tests/cases/lambda/out b/tests/cases/lambda/out index 02bb310..4b4c3f5 100644 --- a/tests/cases/lambda/out +++ b/tests/cases/lambda/out @@ -57,7 +57,7 @@ ) ( { - pkgs ? import ./.. { }, + pkgs ? import ./.. {}, locationsXml, }: null