Merge pull request #146 from kamadorueda/kamadorueda

feat: do not indent lambdas with comments

CHANGELOG.md

@@ -78,6 +78,18 @@ Types of changes
   -      with pkgs;
   +    binPath = with pkgs;
   ```
+- Nested lambdas are now not indented:
+
+  ```diff
+    # comment
+    a:
+  -   # comment
+  -   b:
+  -     _
+  + # comment
+  + b:
+  +   _
+  ```
 
 ## [0.2.0] - 2022-02-17
 

src/rules/lambda.rs

@@ -79,10 +79,11 @@ pub fn rule(
                     child.element.kind(),
                     rnix::SyntaxKind::NODE_ATTR_SET
                         | rnix::SyntaxKind::NODE_PAREN
+                        | rnix::SyntaxKind::NODE_LAMBDA
                         | rnix::SyntaxKind::NODE_LET_IN
                         | rnix::SyntaxKind::NODE_LIST
                         | rnix::SyntaxKind::NODE_STRING
-                ) && build_ctx.pos_new.column > 1;
+                );
 
                 if should_indent {
                     steps.push_back(crate::builder::Step::Indent);

tests/cases/idioms_lib_1/in

@@ -0,0 +1,9 @@
+{
+  traceIf =
+    # Predicate to check
+    pred:
+    # Message that should be traced
+    msg:
+    # Value to return
+    x: if pred then trace msg x else x;
+}

tests/cases/idioms_lib_1/out

@@ -0,0 +1,12 @@
+{
+  traceIf =
+    # Predicate to check
+    pred:
+    # Message that should be traced
+    msg:
+    # Value to return
+    x:
+      if pred
+      then trace msg x
+      else x;
+}