feat: keep lists new lines

src/rules/attr_set.rs

@@ -9,13 +9,20 @@ pub fn rule(
     );
 
     let items_count = node
-        .children()
+        .children_with_tokens()
+        .skip_while(|element| {
+            element.kind() != rnix::SyntaxKind::TOKEN_CURLY_B_OPEN
+        })
+        .take_while(|element| {
+            element.kind() != rnix::SyntaxKind::TOKEN_CURLY_B_CLOSE
+        })
         .filter(|element| {
             matches!(
                 element.kind(),
                 rnix::SyntaxKind::NODE_KEY_VALUE
                     | rnix::SyntaxKind::NODE_INHERIT
                     | rnix::SyntaxKind::NODE_INHERIT_FROM
+                    | rnix::SyntaxKind::TOKEN_COMMENT
             )
         })
         .count();
@@ -66,16 +73,6 @@ pub fn rule(
         crate::config::Layout::Wide => {}
     }
 
-    // /**/
-    children.drain_comments_and_newlines(|element| match element {
-        crate::children::DrainCommentOrNewline::Comment(text) => {
-            steps.push_back(crate::builder::Step::NewLine);
-            steps.push_back(crate::builder::Step::Pad);
-            steps.push_back(crate::builder::Step::Comment(text));
-        }
-        crate::children::DrainCommentOrNewline::Newline(_) => {}
-    });
-
     let mut item_index: usize = 0;
 
     loop {
@@ -85,6 +82,7 @@ pub fn rule(
                 steps.push_back(crate::builder::Step::NewLine);
                 steps.push_back(crate::builder::Step::Pad);
                 steps.push_back(crate::builder::Step::Comment(text));
+                item_index += 1;
             }
             crate::children::DrainCommentOrNewline::Newline(_) => {
                 if item_index > 0 && item_index < items_count {

src/rules/let_in.rs

@@ -77,8 +77,6 @@ pub fn rule(
             }
 
             children.move_next();
-        } else {
-            break;
         }
     }
 

src/rules/list.rs

@@ -4,9 +4,19 @@ pub fn rule(
 ) -> std::collections::LinkedList<crate::builder::Step> {
     let mut steps = std::collections::LinkedList::new();
 
-    let mut children = crate::children::Children::new(build_ctx, node);
+    let mut children = crate::children::Children::new_with_configuration(
+        build_ctx, node, true,
+    );
 
-    let layout = if children.has_comments() {
+    let items_count = node
+        .children_with_tokens()
+        .filter(|element| {
+            !matches!(element.kind(), rnix::SyntaxKind::TOKEN_WHITESPACE)
+        })
+        .count()
+        - 2;
+
+    let layout = if children.has_comments() || children.has_newlines() {
         &crate::config::Layout::Tall
     } else {
         build_ctx.config.layout()
@@ -22,24 +32,34 @@ pub fn rule(
         crate::config::Layout::Wide => {}
     }
 
+    let mut item_index: usize = 0;
+
     loop {
         // /**/
-        children.drain_comments(|text| {
+        children.drain_comments_and_newlines(|element| {
-            steps.push_back(crate::builder::Step::NewLine);
+            match element {
-            steps.push_back(crate::builder::Step::Pad);
+                crate::children::DrainCommentOrNewline::Comment(text) => {
-            steps.push_back(crate::builder::Step::Comment(text));
+                    steps.push_back(crate::builder::Step::NewLine);
+                    steps.push_back(crate::builder::Step::Pad);
+                    steps.push_back(crate::builder::Step::Comment(text));
+                    item_index += 1;
+                }
+                crate::children::DrainCommentOrNewline::Newline(_) => {
+                    if item_index > 0 && item_index < items_count {
+                        steps.push_back(crate::builder::Step::NewLine);
+                    }
+                }
+            };
         });
 
         if let Some(child) = children.peek_next() {
-            let kind = child.element.kind();
+            if let rnix::SyntaxKind::TOKEN_SQUARE_B_CLOSE = child.element.kind()
-
-            if let rnix::SyntaxKind::TOKEN_COMMENT
-            | rnix::SyntaxKind::TOKEN_SQUARE_B_CLOSE = kind
             {
                 break;
             }
 
             // item
+            item_index += 1;
             match layout {
                 crate::config::Layout::Tall => {
                     steps.push_back(crate::builder::Step::NewLine);
@@ -56,18 +76,9 @@ pub fn rule(
             }
 
             children.move_next();
-        } else {
-            break;
         }
     }
 
-    // /**/
-    children.drain_comments(|text| {
-        steps.push_back(crate::builder::Step::NewLine);
-        steps.push_back(crate::builder::Step::Pad);
-        steps.push_back(crate::builder::Step::Comment(text));
-    });
-
     // ]
     let child = children.get_next().unwrap();
     match layout {

tests/cases/attr_set/in

@@ -2,6 +2,8 @@
   {}
   {/*a*/}
   {a=1;}
+  {a=1;
+  }
 
   {       b=1;       }
   {       b=1; /*c*/ }
@@ -18,4 +20,36 @@
   rec /*a*/ { /*b*/ c=1; /*d*/ }
 
   {a=rec {a={a=rec {a={a=rec {a={a=rec {a={a=rec {a={};};};};};};};};};};}
+
+  rec {
+
+    c=1;
+
+
+    e=1;
+
+
+  }
+
+  rec
+  /*a*/
+  {
+
+
+    /*b*/
+
+
+    c=1;
+
+
+    /*d*/
+
+
+    e=1;
+
+
+    /*f*/
+
+
+  }
 ]

tests/cases/attr_set/out

@@ -6,6 +6,10 @@
      */
   }
   { a = 1; }
+  {
+    a = 1;
+  }
+
   { b = 1; }
   {
     b = 1;
@@ -28,6 +32,7 @@
      c
      */
   }
+
   rec { c = 1; }
   rec {
     c = 1;
@@ -90,6 +95,7 @@
      d
      */
   }
+
   {
     a = rec {
       a = {
@@ -101,4 +107,32 @@
       };
     };
   }
+
+  rec {
+    c = 1;
+
+    e = 1;
+  }
+
+  rec
+  /*
+   a
+   */
+  {
+    /*
+     b
+     */
+
+    c = 1;
+
+    /*
+     d
+     */
+
+    e = 1;
+
+    /*
+     f
+     */
+  }
 ]

tests/cases/comment/out

@@ -1,38 +1,49 @@
 [
   /**/
   /**/
+
   /**/
+
   /**/
+
   /**/
+
   /**/
+
   /*
    @
    */
+
   /*
     *
     @
    *
    */
+
   /*
        @
     @
    @
    */
+
   /*
     @
    @
     @
    */
+
   /*
          @
    @
        @
    */
+
   /*
      @
     @
    @
    */
+
   /*
      test
    * test

tests/cases/lists/in

@@ -0,0 +1,46 @@
+[
+  [ 1 ]
+
+  [ 1
+  ]
+
+  [       b       d       ]
+  [       b       d /*e*/ ]
+  [       b /*c*/ d       ]
+  [       b /*c*/ d /*e*/ ]
+  [ /*a*/ b       d       ]
+  [ /*a*/ b       d /*e*/ ]
+  [ /*a*/ b /*c*/ d       ]
+  [ /*a*/ b /*c*/ d /*e*/ ]
+
+  [
+
+
+    b
+
+
+    d
+
+
+  ]
+  [
+
+
+    /*a*/
+
+
+    b
+
+
+    /*c*/
+
+
+    d
+
+
+    /*e*/
+
+
+  ]
+
+]

tests/cases/lists/out

@@ -0,0 +1,96 @@
+[
+  [ 1 ]
+
+  [
+    1
+  ]
+
+  [ b d ]
+  [
+    b
+    d
+    /*
+     e
+     */
+  ]
+  [
+    b
+    /*
+     c
+     */
+    d
+  ]
+  [
+    b
+    /*
+     c
+     */
+    d
+    /*
+     e
+     */
+  ]
+  [
+    /*
+     a
+     */
+    b
+    d
+  ]
+  [
+    /*
+     a
+     */
+    b
+    d
+    /*
+     e
+     */
+  ]
+  [
+    /*
+     a
+     */
+    b
+    /*
+     c
+     */
+    d
+  ]
+  [
+    /*
+     a
+     */
+    b
+    /*
+     c
+     */
+    d
+    /*
+     e
+     */
+  ]
+
+  [
+    b
+
+    d
+  ]
+  [
+    /*
+     a
+     */
+
+    b
+
+    /*
+     c
+     */
+
+    d
+
+    /*
+     e
+     */
+  ]
+]

tests/cases/pat_bind/out

@@ -20,6 +20,7 @@
     a:
     _
   )
+
   (a @ { }: _)
   (
     a @

tests/cases/pattern/out

@@ -26,6 +26,7 @@
     }:
     _
   )
+
   (
     { b
     , e
@@ -1050,6 +1051,7 @@
     }:
     _
   )
+
   ({ a ? null }: _)
   (
     { /*

tests/cases/string/out

@@ -29,6 +29,7 @@
   ''    a
   ''
   ###
+
   ''    a
   ''
   ###