From a0cf26d62c8d3ebaa1e69c3713a48d986757e6a8 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 3 Jul 2025 22:43:44 +0300 Subject: [PATCH] list&attr_set: add spaces to [] and {} when not empty --- src/alejandra/src/rules/attr_set.rs | 6 +++--- src/alejandra/src/rules/list.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/alejandra/src/rules/attr_set.rs b/src/alejandra/src/rules/attr_set.rs index cb9a106..facdc27 100644 --- a/src/alejandra/src/rules/attr_set.rs +++ b/src/alejandra/src/rules/attr_set.rs @@ -100,9 +100,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::FormatWider(child)); } else { - if item_index > 1 { - steps.push_back(crate::builder::Step::Whitespace); - } + steps.push_back(crate::builder::Step::Whitespace); steps.push_back(crate::builder::Step::Format(child)); } children.move_next(); @@ -116,6 +114,8 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Dedent); steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); + } else if items_count > 0 { + steps.push_back(crate::builder::Step::Whitespace); } steps.push_back(crate::builder::Step::Format(child)); diff --git a/src/alejandra/src/rules/list.rs b/src/alejandra/src/rules/list.rs index 4fbb241..92859f8 100644 --- a/src/alejandra/src/rules/list.rs +++ b/src/alejandra/src/rules/list.rs @@ -73,9 +73,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::FormatWider(child)); } else { - if item_index > 1 { - steps.push_back(crate::builder::Step::Whitespace); - } + steps.push_back(crate::builder::Step::Whitespace); steps.push_back(crate::builder::Step::Format(child)); } @@ -90,6 +88,8 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Dedent); steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); + } else if items_count > 0 { + steps.push_back(crate::builder::Step::Whitespace); } steps.push_back(crate::builder::Step::Format(child));