feat: conform comments to editorconfig with indent_size = 2

fix: #294

src/alejandra/src/builder.rs

@@ -55,11 +55,11 @@ fn build_step(
                 .iter()
                 .enumerate()
                 .map(|(index, line)| {
-                    if index == 0 {
+                    if index == 0 || line.is_empty() {
                         line.to_string()
                     } else {
                         format!(
-                            "{0:<1$} {2}",
+                            "{0:<1$}{2}",
                             "",
                             2 * build_ctx.indentation,
                             line,

src/alejandra/tests/cases/apply/out

@@ -6,21 +6,21 @@
     (a b)
     (a
       /*
-       b
+      b
-       */
+      */
       c)
     (
       /*
-       a
+      a
-       */
+      */
       b
       /*
-       c
+      c
-       */
+      */
       d
       /*
-       e
+      e
-       */
+      */
     )
   )
   ''

src/alejandra/tests/cases/assert/out

@@ -2,42 +2,42 @@
   (assert b; e)
   (assert b;
     /*
-     d
+    d
-     */
+    */
       e)
   (assert b; e)
   (assert b;
     /*
-     d
+    d
-     */
+    */
       e)
   (assert
     /*
-     a
+    a
-     */
+    */
     b; e)
   (assert
     /*
-     a
+    a
-     */
+    */
     b;
     /*
-     d
+    d
-     */
+    */
       e)
   (assert
     /*
-     a
+    a
-     */
+    */
     b; e)
   (assert
     /*
-     a
+    a
-     */
+    */
     b;
     /*
-     d
+    d
-     */
+    */
       e)
   (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
   (assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)

src/alejandra/tests/cases/attr_set/out

@@ -2,8 +2,8 @@
   {}
   {
     /*
-     a
+    a
-     */
+    */
   }
   {a = 1;}
   {
@@ -14,86 +14,86 @@
   {
     b = 1;
     /*
-     c
+    c
-     */
+    */
   }
   {
     /*
-     a
+    a
-     */
+    */
     b = 1;
   }
   {
     /*
-     a
+    a
-     */
+    */
     b = 1;
     /*
-     c
+    c
-     */
+    */
   }
 
   rec {c = 1;}
   rec {
     c = 1;
     /*
-     d
+    d
-     */
+    */
   }
   rec {
     /*
-     b
+    b
-     */
+    */
     c = 1;
   }
   rec {
     /*
-     b
+    b
-     */
+    */
     c = 1;
     /*
-     d
+    d
-     */
+    */
   }
   rec
   /*
-   a
+  a
-   */
+  */
   {
     c = 1;
   }
   rec
   /*
-   a
+  a
-   */
+  */
   {
     c = 1;
     /*
-     d
+    d
-     */
+    */
   }
   rec
   /*
-   a
+  a
-   */
+  */
   {
     /*
-     b
+    b
-     */
+    */
     c = 1;
   }
   rec
   /*
-   a
+  a
-   */
+  */
   {
     /*
-     b
+    b
-     */
+    */
     c = 1;
     /*
-     d
+    d
-     */
+    */
   }
 
   {
@@ -116,23 +116,23 @@
 
   rec
   /*
-   a
+  a
-   */
+  */
   {
     /*
-     b
+    b
-     */
+    */
 
     c = 1;
 
     /*
-     d
+    d
-     */
+    */
 
     e = 1;
 
     /*
-     f
+    f
-     */
+    */
   }
 ]

src/alejandra/tests/cases/comment/out

@@ -11,43 +11,43 @@
   /**/
 
   /*
-   @
+  @
-   */
+  */
 
   /*
-    *
-    @
    *
-   */
+   @
+  *
+  */
 
   /*
-       @
+      @
-    @
    @
-   */
+  @
+  */
+
+  /*
+   @
+  @
+   @
+  */
+
+  /*
+        @
+  @
+      @
+  */
 
   /*
     @
    @
-    @
+  @
-   */
+  */
 
   /*
-         @
+    test
-   @
+  * test
-       @
+  */
-   */
-
-  /*
-     @
-    @
-   @
-   */
-
-  /*
-     test
-   * test
-   */
 
   [
     # 1

src/alejandra/tests/cases/dynamic/out

@@ -1,16 +1,16 @@
 a
 .${
   /*
-   b
+  b
-   */
+  */
   c
   .${
     /*
-     d
+    d
-     */
+    */
     e.${f}
   }
   /*
-   g
+  g
-   */
+  */
 }

src/alejandra/tests/cases/if_else/out

@@ -77,8 +77,8 @@
     then b
     else
       /*
-       x
+      x
-       */
+      */
       if a
       then b
       else c

src/alejandra/tests/cases/inherit/out

@@ -13,16 +13,16 @@
       b
       d
       /*
-       e
+      e
-       */
+      */
       ;
   }
   {
     inherit
       b
       /*
-       c
+      c
-       */
+      */
       d
       ;
   }
@@ -30,19 +30,19 @@
     inherit
       b
       /*
-       c
+      c
-       */
+      */
       d
       /*
-       e
+      e
-       */
+      */
       ;
   }
   {
     inherit
       /*
-       a
+      a
-       */
+      */
       b
       d
       ;
@@ -50,40 +50,40 @@
   {
     inherit
       /*
-       a
+      a
-       */
+      */
       b
       d
       /*
-       e
+      e
-       */
+      */
       ;
   }
   {
     inherit
       /*
-       a
+      a
-       */
+      */
       b
       /*
-       c
+      c
-       */
+      */
       d
       ;
   }
   {
     inherit
       /*
-       a
+      a
-       */
+      */
       b
       /*
-       c
+      c
-       */
+      */
       d
       /*
-       e
+      e
-       */
+      */
       ;
   }
   {

src/alejandra/tests/cases/key_value/out

@@ -10,73 +10,73 @@ rec
     a =
       1
       /*
-       d
+      d
-       */
+      */
       ;
   };
 
   c = {
     a =
       /*
-       c
+      c
-       */
+      */
       1;
   };
   d = {
     a =
       /*
-       c
+      c
-       */
+      */
       1
       /*
-       d
+      d
-       */
+      */
       ;
   };
   e = {
     a
     /*
-     b
+    b
-     */
+    */
     =
       1;
   };
   f = {
     a
     /*
-     b
+    b
-     */
+    */
     =
       1
       /*
-       d
+      d
-       */
+      */
       ;
   };
   h = {
     a
     /*
-     b
+    b
-     */
+    */
     =
       /*
-       c
+      c
-       */
+      */
       1;
   };
   i = {
     a
     /*
-     b
+    b
-     */
+    */
     =
       /*
-       c
+      c
-       */
+      */
       1
       /*
-       d
+      d
-       */
+      */
       ;
   };
   j = a: {b = 1;};
@@ -86,13 +86,13 @@ rec
   };
   l = a:
   /*
-   b
+  b
-   */
+  */
   {b = 1;};
   m = a:
   /*
-   b
+  b
-   */
+  */
   {
     b = 1;
     c = 2;
@@ -102,16 +102,16 @@ rec
 
   a
   /*
-   b
+  b
-   */
+  */
   =
     /*
-     c
+    c
-     */
+    */
     1
     /*
-     d
+    d
-     */
+    */
     ;
 
   p =

src/alejandra/tests/cases/lambda/out

@@ -1,39 +1,39 @@
 [
   (a: b:
     /*
-     c
+    c
-     */
+    */
       d)
   ({}: b:
     /*
-     c
+    c
-     */
+    */
       d)
   (a: {}:
     /*
-     c
+    c
-     */
+    */
       d)
   (a: d)
   (a:
     /*
-     c
+    c
-     */
+    */
       d)
   (a
     /*
-     b
+    b
-     */
+    */
     :
       d)
   (a
     /*
-     b
+    b
-     */
+    */
     :
     /*
-     c
+    c
-     */
+    */
       d)
   (
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

src/alejandra/tests/cases/let_in/out

@@ -13,15 +13,15 @@ let
     c = 1;
   in
     /*
-     e
+    e
-     */
+    */
     f;
   /**/
   a = let
     c = 1;
     /*
-     d
+    d
-     */
+    */
   in
     f;
   /**/
@@ -29,56 +29,56 @@ let
   a = let
     c = 1;
     /*
-     d
+    d
-     */
+    */
   in
     /*
-     e
+    e
-     */
+    */
     f;
   /**/
   a = let
     /*
-     b
+    b
-     */
+    */
     c = 1;
   in
     f;
   /**/
   a = let
     /*
-     b
+    b
-     */
+    */
     c = 1;
   in
     /*
-     e
+    e
-     */
+    */
     f;
   /**/
   a = let
     /*
-     b
+    b
-     */
+    */
     c = 1;
     /*
-     d
+    d
-     */
+    */
   in
     f;
   /**/
   a = let
     /*
-     b
+    b
-     */
+    */
     c = 1;
     /*
-     d
+    d
-     */
+    */
   in
     /*
-     e
+    e
-     */
+    */
     f;
   /**/
 

src/alejandra/tests/cases/lists/out

@@ -10,65 +10,65 @@
     b
     d
     /*
-     e
+    e
-     */
+    */
   ]
   [
     b
     /*
-     c
+    c
-     */
+    */
     d
   ]
   [
     b
     /*
-     c
+    c
-     */
+    */
     d
     /*
-     e
+    e
-     */
+    */
   ]
   [
     /*
-     a
+    a
-     */
+    */
     b
     d
   ]
   [
     /*
-     a
+    a
-     */
+    */
     b
     d
     /*
-     e
+    e
-     */
+    */
   ]
   [
     /*
-     a
+    a
-     */
+    */
     b
     /*
-     c
+    c
-     */
+    */
     d
   ]
   [
     /*
-     a
+    a
-     */
+    */
     b
     /*
-     c
+    c
-     */
+    */
     d
     /*
-     e
+    e
-     */
+    */
   ]
 
   [
@@ -78,19 +78,19 @@
   ]
   [
     /*
-     a
+    a
-     */
+    */
 
     b
 
     /*
-     c
+    c
-     */
+    */
 
     d
 
     /*
-     e
+    e
-     */
+    */
   ]
 ]

src/alejandra/tests/cases/paren/out

@@ -6,160 +6,160 @@
   (
     c
     /*
-     e
+    e
-     */
+    */
   )
   (
     c
     /*
-     d
+    d
-     */
+    */
   )
   (
     (
       c
       /*
-       d
+      d
-       */
+      */
     )
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     b
+    b
-     */
+    */
     c
   )
   (
     (
       /*
-       b
+      b
-       */
+      */
       c
     )
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     b
+    b
-     */
+    */
     c
     /*
-     d
+    d
-     */
+    */
   )
   (
     (
       /*
-       b
+      b
-       */
+      */
       c
       /*
-       d
+      d
-       */
+      */
     )
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     a
+    a
-     */
+    */
     c
   )
   (
     /*
-     a
+    a
-     */
+    */
     c
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       c
       /*
-       d
+      d
-       */
+      */
     )
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       c
       /*
-       d
+      d
-       */
+      */
     )
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       /*
-       b
+      b
-       */
+      */
       c
     )
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       /*
-       b
+      b
-       */
+      */
       c
     )
     /*
-     e
+    e
-     */
+    */
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       /*
-       b
+      b
-       */
+      */
       c
       /*
-       d
+      d
-       */
+      */
     )
   )
   (
     /*
-     a
+    a
-     */
+    */
     (
       /*
-       b
+      b
-       */
+      */
       c
       /*
-       d
+      d
-       */
+      */
     )
     /*
-     e
+    e
-     */
+    */
   )
 )

src/alejandra/tests/cases/root/out

@@ -1,12 +1,12 @@
 /*
- Some functions f
+Some functions f
-     name attribute.
+    name attribute.
- */
+*/
 /*
-     Add to or over
+    Add to or over
- derivation.
+derivation.
- 
+
- Example:
+Example:
-   addMetaAttrs {des
+  addMetaAttrs {des
- */
+*/
 1

src/alejandra/tests/cases/string_interpol/out

@@ -1,14 +1,14 @@
 "${
   /*
-   a
+  a
-   */
+  */
   "${
     /*
-     b
+    b
-     */
+    */
     "${c}"
   }"
   /*
-   d
+  d
-   */
+  */
 }"

src/alejandra/tests/cases/with/out

@@ -2,22 +2,22 @@
   (with b; c)
   (with b;
     /*
-     b
+    b
-     */
+    */
       c)
   (with
     /*
-     a
+    a
-     */
+    */
     b; c)
   (with
     /*
-     a
+    a
-     */
+    */
     b;
     /*
-     b
+    b
-     */
+    */
       c)
   (with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
   (with b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
@@ -49,8 +49,8 @@
     })
   (with a;
     /*
-     comment
+    comment
-     */
+    */
     with b;
     with c; {
       a = 1;