From 7077ad128c9752b19f4e42cf433a6afea0472f0a Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Wed, 9 Feb 2022 21:07:59 -0500
Subject: [PATCH] feat: with without max-width

---
 src/rules/with.rs | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/rules/with.rs b/src/rules/with.rs
index 60b6bb1..6a13f60 100644
--- a/src/rules/with.rs
+++ b/src/rules/with.rs
@@ -4,9 +4,11 @@ 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 layout = if children.has_comments() || children.has_newlines() {
         &crate::config::Layout::Tall
     } else {
         build_ctx.config.layout()
@@ -17,13 +19,17 @@ pub fn rule(
     steps.push_back(crate::builder::Step::Format(child.element));
 
     // /**/
-    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));
+    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(_) => {}
     });
 
-    if let rnix::SyntaxKind::TOKEN_COMMENT =
+    if let rnix::SyntaxKind::TOKEN_COMMENT
+    | rnix::SyntaxKind::TOKEN_WHITESPACE =
         children.peek_prev().unwrap().element.kind()
     {
         steps.push_back(crate::builder::Step::NewLine);
@@ -48,10 +54,13 @@ pub fn rule(
     steps.push_back(crate::builder::Step::Format(child.element));
 
     // /**/
-    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));
+    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(_) => {}
     });
 
     // expr