feat: rebase Vladimir's pr

Author: kamadorueda

src/alejandra/src/builder.rs

@@ -1,4 +1,5 @@
 use crate::config::Config;
+use crate::config::Indentation;
 
 #[derive(PartialEq)]
 pub(crate) enum Step {
@@ -15,14 +16,13 @@ pub(crate) enum Step {
 
 #[derive(Clone)]
 pub(crate) struct BuildCtx {
-    pub _config:            Config,
+    pub config:             Config,
     pub force_wide:         bool,
     pub force_wide_success: bool,
     pub indentation:        usize,
     pub pos_old:            crate::position::Position,
     pub path:               String,
     pub vertical:           bool,
-    pub indent:             String,
 }
 
 pub(crate) fn build(
@@ -100,7 +100,12 @@ fn build_step(
                 add_token(
                     builder,
                     rnix::SyntaxKind::TOKEN_WHITESPACE,
-                    &build_ctx.indent.repeat(build_ctx.indentation),
+                    &match build_ctx.config.indentation {
+                        Indentation::FourSpaces => "    ",
+                        Indentation::Tabs => "\t",
+                        Indentation::TwoSpaces => "  ",
+                    }
+                    .repeat(build_ctx.indentation),
                 );
             }
         }

src/alejandra/src/config.rs

@@ -2,4 +2,19 @@ use serde::Deserialize;
 
 /// Configuration used by the formatter
 #[derive(Clone, Copy, Default, Deserialize)]
-pub struct Config {}
+pub struct Config {
+    /// Indentation to use
+    pub indentation: Indentation,
+}
+
+#[derive(Clone, Copy, Default, Deserialize)]
+/// Indentation options
+pub enum Indentation {
+    /// Four spaces
+    FourSpaces,
+    /// Tabs
+    Tabs,
+    #[default]
+    /// Two spaces
+    TwoSpaces,
+}

src/alejandra/src/format.rs

@@ -32,14 +32,13 @@ pub fn in_memory(
     }
 
     let mut build_ctx = crate::builder::BuildCtx {
-        _config: config,
+        config,
         force_wide: false,
         force_wide_success: true,
         indentation: 0,
         path,
         pos_old: crate::position::Position::default(),
         vertical: true,
-        indent,
     };
 
     let after = crate::builder::build(&mut build_ctx, ast.node().into())

src/alejandra/tests/cases/apply/out.nix renamed to src/alejandra/tests/cases/apply/out-default.nix

@@ -0,0 +1,114 @@
+[
+	(a
+		b)
+	(
+		(a b)
+		(a b)
+		(a
+			/*
+      b
+      */
+			c)
+		(
+			/*
+      a
+      */
+			b
+			/*
+      c
+      */
+			d
+			/*
+      e
+      */
+		)
+	)
+	''
+	  otherModules=${
+			pkgs.writeText "other-modules.json"
+			(l.toJSON
+				(l.mapAttrs
+					(pname: subOutputs: let
+							pkg =
+								subOutputs.packages."${pname}".overrideAttrs (old: {
+										buildScript = "true";
+										installMethod = "copy";
+									});
+						in "${pkg}/lib/node_modules/${pname}/node_modules")
+					outputs.subPackages))
+		}
+	''
+	{
+		name1 =
+			function
+			arg
+			{asdf = 1;};
+
+		name2 =
+			function
+			arg
+			{asdf = 1;}
+			argument;
+
+		name3 =
+			function
+			arg
+			{asdf = 1;}
+			{qwer = 12345;}
+			argument;
+	}
+	{
+		name1 =
+			function arg {
+				asdf = 1;
+			};
+
+		name2 =
+			function arg {
+				asdf = 1;
+			}
+			argument;
+
+		name3 =
+			function arg {
+				asdf = 1;
+			} {
+				qwer = 12345;
+			}
+			argument;
+	}
+	{
+		name4 =
+			function
+			arg
+			{asdf = 1;}
+			{
+				qwer = 12345;
+				qwer2 = 54321;
+			}
+			argument;
+	}
+	{
+		option1 =
+			function arg {asdf = 1;} {
+				qwer = 12345;
+				qwer2 = 54321;
+			}
+			lastArg;
+
+		option2 =
+			function arg {asdf = 1;} {
+				qwer = 12345;
+				qwer2 = 54321;
+			}
+			lastArg;
+
+		option3 =
+			function arg {asdf = 1;}
+			{
+				qwer = 12345;
+				qwer2 = 54321;
+			}
+			lastArg;
+	}
+]

src/alejandra/tests/cases/apply/out-tabs.nix

@@ -0,0 +1,44 @@
+[
+	(assert b; e)
+	(assert b;
+		/*
+    d
+    */
+			e)
+	(assert b; e)
+	(assert b;
+		/*
+    d
+    */
+			e)
+	(assert
+		/*
+    a
+    */
+		b; e)
+	(assert
+		/*
+    a
+    */
+		b;
+		/*
+    d
+    */
+			e)
+	(assert
+		/*
+    a
+    */
+		b; e)
+	(assert
+		/*
+    a
+    */
+		b;
+		/*
+    d
+    */
+			e)
+	(assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
+	(assert b; cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc)
+]

src/alejandra/tests/cases/assert/out.nix renamed to src/alejandra/tests/cases/assert/out-default.nix

@@ -0,0 +1,138 @@
+[
+	{}
+	{
+		/*
+    a
+    */
+	}
+	{a = 1;}
+	{
+		a = 1;
+	}
+
+	{b = 1;}
+	{
+		b = 1;
+		/*
+    c
+    */
+	}
+	{
+		/*
+    a
+    */
+		b = 1;
+	}
+	{
+		/*
+    a
+    */
+		b = 1;
+		/*
+    c
+    */
+	}
+
+	rec {c = 1;}
+	rec {
+		c = 1;
+		/*
+    d
+    */
+	}
+	rec {
+		/*
+    b
+    */
+		c = 1;
+	}
+	rec {
+		/*
+    b
+    */
+		c = 1;
+		/*
+    d
+    */
+	}
+	rec
+	/*
+  a
+  */
+	{
+		c = 1;
+	}
+	rec
+	/*
+  a
+  */
+	{
+		c = 1;
+		/*
+    d
+    */
+	}
+	rec
+	/*
+  a
+  */
+	{
+		/*
+    b
+    */
+		c = 1;
+	}
+	rec
+	/*
+  a
+  */
+	{
+		/*
+    b
+    */
+		c = 1;
+		/*
+    d
+    */
+	}
+
+	{
+		a = rec {
+			a = {
+				a = rec {
+					a = {
+						a = rec {a = {a = rec {a = {a = rec {a = {};};};};};};
+					};
+				};
+			};
+		};
+	}
+
+	rec {
+		c = 1;
+
+		e = 1;
+	}
+
+	rec
+	/*
+  a
+  */
+	{
+		/*
+    b
+    */
+
+		c = 1;
+
+		/*
+    d
+    */
+
+		e = 1;
+
+		/*
+    f
+    */
+	}
+]