Merge pull request #113 from kamadorueda/kamadorueda

feat: no space in empty containers

Author: kamadorueda

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));

src/rules/list.rs

@@ -69,7 +69,9 @@ pub fn rule(
                     ));
                 }
                 crate::config::Layout::Wide => {
-                    steps.push_back(crate::builder::Step::Whitespace);
+                    if item_index > 1 {
+                        steps.push_back(crate::builder::Step::Whitespace);
+                    }
                     steps
                         .push_back(crate::builder::Step::Format(child.element));
                 }
@@ -87,9 +89,7 @@ pub fn rule(
             steps.push_back(crate::builder::Step::NewLine);
             steps.push_back(crate::builder::Step::Pad);
         }
-        crate::config::Layout::Wide => {
-            steps.push_back(crate::builder::Step::Whitespace);
-        }
+        crate::config::Layout::Wide => {}
     }
     steps.push_back(crate::builder::Step::Format(child.element));
 

src/rules/pattern.rs

@@ -153,8 +153,9 @@ pub fn rule(
     // }
     let child = children.get_next().unwrap();
     steps.push_back(crate::builder::Step::Dedent);
-    if !has_comments_between_curly_b && items_count <= 1 {
+    if !has_comments_between_curly_b && items_count == 1 {
         steps.push_back(crate::builder::Step::Whitespace);
+    } else if !has_comments_between_curly_b && items_count == 0 {
     } else {
         if let rnix::SyntaxKind::NODE_PAT_ENTRY = last_kind {
             steps.push_back(crate::builder::Step::Token(

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 = {}; }; }; }; }; };
           };
         };
       };

tests/cases/idioms/out

@@ -19,7 +19,7 @@
         url = "example/${version}";
       };
       meta = with lib; {
-        maintainers = with maintainers; [ someone ];
+        maintainers = with maintainers; [someone];
         description = "something";
       };
     }

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;
 }

tests/cases/lambda/out

@@ -7,7 +7,7 @@
       d
   )
   (
-    { }:
+    {}:
       b:
       /*
        c
@@ -16,7 +16,7 @@
   )
   (
     a:
-      { }:
+      {}:
       /*
        c
        */
@@ -57,14 +57,14 @@
   )
   (
     {
-      pkgs ? import ./.. { },
+      pkgs ? import ./.. {},
       locationsXml,
     }:
       null
   )
   (
     a: b: c:
-      { }:
+      {}:
         a: b: c:
           a
   )

tests/cases/lists/out

@@ -1,11 +1,11 @@
 [
-  [ 1 ]
+  [1]
 
   [
     1
   ]
 
-  [ b d ]
+  [b d]
   [
     b
     d

tests/cases/pat_bind/out

@@ -1,45 +1,45 @@
 [
-  ({ } @ a: _)
+  ({} @ a: _)
   (
-    { } @
+    {} @
     /**/
     a:
       _
   )
   (
-    { }
+    {}
     /**/
     @ a:
       _
   )
   (
-    { }
+    {}
     /**/
     @
     /**/
     a:
       _
   )
 
-  (a @ { }: _)
+  (a @ {}: _)
   (
     a @
     /**/
-    { }:
+    {}:
       _
   )
   (
     a
     /**/
-    @ { }:
+    @ {}:
       _
   )
   (
     a
     /**/
     @
     /**/
-    { }:
+    {}:
       _
   )
 ]

tests/cases/pattern/out

@@ -8,7 +8,7 @@
     @ inp:
       _
   )
-  ({ }: _)
+  ({}: _)
   ({ a }: _)
   (
     {