Merge pull request #143 from kamadorueda/kamadorueda

feat: continue lambda on the same line

CHANGELOG.md

@@ -60,6 +60,19 @@ Types of changes
   +  {pkgs, ...}:
   ```
 
+- Pattern matching lambdas now follow the equal sign:
+  ```diff
+  -  fnLocationRelative =
+  -    {
+  -      name,
+  -      value,
+  -    }:
+  +  fnLocationRelative = {
+  +    name,
+  +    value,
+  +  }:
+  ```
+
 ## [0.2.0] - 2022-02-17
 
 ### Added

src/rules/lambda.rs

@@ -65,23 +65,7 @@ pub fn rule(
     let child = children.get_next().unwrap();
     match layout {
         crate::config::Layout::Tall => {
-            if is_pattern_type
+            if comment
-                || comment
-                || (matches!(
-                    child.element.kind(),
-                    rnix::SyntaxKind::NODE_LAMBDA
-                ) && matches!(
-                    child
-                        .element
-                        .clone()
-                        .into_node()
-                        .unwrap()
-                        .children()
-                        .next()
-                        .unwrap()
-                        .kind(),
-                    rnix::SyntaxKind::NODE_PATTERN
-                ))
                 || !matches!(
                     child.element.kind(),
                     rnix::SyntaxKind::NODE_ATTR_SET

tests/cases/lambda/in

@@ -16,4 +16,21 @@
     { }:
     a: b: c:
     a)
+
+  ({pkgs, ...}: {
+    # Stuff
+  })
+
+  ({pkgs, ...}: let
+  in pkgs)
+
+  (a: {b,
+  ...}: c: {
+    # Stuff
+  })
+
+  (a: {b, c,
+  ...}: d: {
+    # Stuff
+  })
 ]

tests/cases/lambda/out

@@ -4,18 +4,16 @@
    c
    */
     d)
-  ({}:
+  ({}: b:
-    b:
+  /*
-    /*
+   c
-     c
+   */
-     */
+    d)
-      d)
+  (a: {}:
-  (a:
+  /*
-    {}:
+   c
-    /*
+   */
-     c
+    d)
-     */
-      d)
   (a: d)
   (a:
   /*
@@ -48,8 +46,26 @@
     locationsXml,
   }:
     null)
-  (a: b: c:
+  (a: b: c: {}: a: b: c:
-    {}:
+    a)
-      a: b: c:
+
-        a)
+  ({pkgs, ...}: {
+    # Stuff
+  })
+
+  ({pkgs, ...}: let
+  in
+    pkgs)
+
+  (a: {b, ...}: c: {
+    # Stuff
+  })
+
+  (a: {
+    b,
+    c,
+    ...
+  }: d: {
+    # Stuff
+  })
 ]