Merge pull request #132 from kamadorueda/kamadorueda

feat: lisp-like parens
kamadorueda · Feb 17, 2022 · ea6e3bf · ea6e3bf
2 parents e5e42a3 + 9c27dfa
commit ea6e3bf
Show file tree

Hide file tree

Showing 13 changed files with 1,565 additions and 1,882 deletions.
diff --git a/src/rules/paren.rs b/src/rules/paren.rs
@@ -8,7 +8,10 @@ pub fn rule(
         build_ctx, node, true,
     );
 
-    let layout = if children.has_comments() || children.has_newlines() {
+    let has_comments_or_newlines =
+        children.has_comments() || children.has_newlines();
+
+    let layout = if has_comments_or_newlines {
         &crate::config::Layout::Tall
     } else {
         build_ctx.config.layout()
@@ -19,7 +22,9 @@ pub fn rule(
     steps.push_back(crate::builder::Step::Format(child.element));
     match layout {
         crate::config::Layout::Tall => {
-            steps.push_back(crate::builder::Step::Indent);
+            if has_comments_or_newlines {
+                steps.push_back(crate::builder::Step::Indent);
+            }
         }
         crate::config::Layout::Wide => {}
     }
@@ -38,8 +43,10 @@ pub fn rule(
     let child = children.get_next().unwrap();
     match layout {
         crate::config::Layout::Tall => {
-            steps.push_back(crate::builder::Step::NewLine);
-            steps.push_back(crate::builder::Step::Pad);
+            if has_comments_or_newlines {
+                steps.push_back(crate::builder::Step::NewLine);
+                steps.push_back(crate::builder::Step::Pad);
+            }
             steps.push_back(crate::builder::Step::FormatWider(child.element));
         }
         crate::config::Layout::Wide => {
@@ -61,9 +68,11 @@ pub fn rule(
     let child = children.get_next().unwrap();
     match layout {
         crate::config::Layout::Tall => {
-            steps.push_back(crate::builder::Step::Dedent);
-            steps.push_back(crate::builder::Step::NewLine);
-            steps.push_back(crate::builder::Step::Pad);
+            if has_comments_or_newlines {
+                steps.push_back(crate::builder::Step::Dedent);
+                steps.push_back(crate::builder::Step::NewLine);
+                steps.push_back(crate::builder::Step::Pad);
+            }
         }
         crate::config::Layout::Wide => {}
     }

diff --git a/tests/cases/apply/out b/tests/cases/apply/out
@@ -1,12 +1,10 @@
 (a b)
 (a b)
-(
-  a
-  /*
-   b
-   */
-  c
-)
+(a
+/*
+ b
+ */
+c)
 (
   /*
    a

diff --git a/tests/cases/assert/out b/tests/cases/assert/out
@@ -1,30 +1,24 @@
 [
   (assert b; c)
-  (
-    assert b;
-    /*
-     b
-     */
-    c
-  )
-  (
-    assert
-    /*
-     a
-     */
-    b; c
-  )
-  (
-    assert
-    /*
-     a
-     */
-    b;
-    /*
-     b
-     */
-    c
-  )
+  (assert b;
+  /*
+   b
+   */
+  c)
+  (assert
+  /*
+   a
+   */
+  b; c)
+  (assert
+  /*
+   a
+   */
+  b;
+  /*
+   b
+   */
+  c)
   (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
   (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
 ]
diff --git a/tests/cases/bin_op/out b/tests/cases/bin_op/out
@@ -1,63 +1,49 @@
 [
   (1 + 1)
-  (
-    1
-    +
-    /**/
-    1
-  )
-  (
-    1
-    /**/
-    + 1
-  )
-  (
-    1
-    /**/
-    +
-    /**/
-    1
-  )
-  (
-    1
-    /**/
-    +
-    /**/
-    (
-      1
-      /**/
-      +
-      /**/
-      (
-        1
-        /**/
-        +
-        /**/
-        1
-      )
-    )
-  )
+  (1
+  +
+  /**/
+  1)
+  (1
+  /**/
+  + 1)
+  (1
+  /**/
+  +
+  /**/
+  1)
+  (1
+  /**/
+  +
+  /**/
+  (1
+  /**/
+  +
+  /**/
+  (1
+  /**/
+  +
+  /**/
+  1)))
   (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1)
-  (
-    1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-    + 1
-  )
+  (1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1
+  + 1)
 ]
diff --git a/tests/cases/comment/out b/tests/cases/comment/out
@@ -81,30 +81,26 @@
     #7
   }
 
-  (
-    let
-      # 1
-      #2
-      a = 1; # 3
-      b = 1;
-      c = 1; # 4
-      #5
-
-      #6
-
-      d = 1;
-      #7
-    in
-      d
-  )
-
-  (
-    {
-      a,
-      # comment
-      b ? 2,
-      # comment
-    }:
-      _
-  )
+  (let
+    # 1
+    #2
+    a = 1; # 3
+    b = 1;
+    c = 1; # 4
+    #5
+
+    #6
+
+    d = 1;
+    #7
+  in
+    d)
+
+  ({
+    a,
+    # comment
+    b ? 2,
+    # comment
+  }:
+    _)
 ]