Merge pull request #137 from kamadorueda/kamadorueda

feat: inline end at

CHANGELOG.md

@@ -20,6 +20,19 @@ Types of changes
 ### Changed
 
 - Let-in expressions are now indented in the top-level of a file.
+- Patterns avoid a new line after `@`:
+
+  ```nix
+  -        args @
+  -        {
+  +        args @ {
+  ```
+
+  ```nix
+  -  }
+  -  @ inp:
+  +  } @ inp:
+  ```
 
 ## [0.2.0] - 2022-02-17
 

src/rules/pattern.rs

@@ -174,11 +174,13 @@ pub fn rule(
     steps.push_back(crate::builder::Step::Format(child.element));
 
     // /**/
+    let mut comment = false;
     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));
+            comment = true;
         }
         crate::children::DrainCommentOrNewline::Newline(_) => {}
     });
@@ -186,11 +188,11 @@ pub fn rule(
     // @ x
     if let Some(child) = children.peek_next() {
         if let rnix::SyntaxKind::NODE_PAT_BIND = child.element.kind() {
-            if !has_comments && items_count <= 1 {
+            if comment {
-                steps.push_back(crate::builder::Step::Whitespace);
-            } else {
                 steps.push_back(crate::builder::Step::NewLine);
                 steps.push_back(crate::builder::Step::Pad);
+            } else {
+                steps.push_back(crate::builder::Step::Whitespace);
             }
             match layout {
                 crate::config::Layout::Tall => {

tests/cases/pattern/out

@@ -9,8 +9,7 @@
     self,
     gomod2nix,
     mach-nix,
-  }
+  } @ inp:
-  @ inp:
     _)
   ({}: _)
   ({ a }: _)