Sync exposed CodeFormatterOptions with currently supported cli options (#1176)

Phault · belav · web-flow · commit d2cd50991348 · 2024-02-13T20:04:17.000-06:00
* Sync exposed CodeFormatterOptions with currently supported cli options Closes #1172 * Formatting files --------- Co-authored-by: Bela VanderVoort <bela.vandervoort@optimizely.com>
diff --git a/Src/CSharpier.Tests/CodeFormatterTests.cs b/Src/CSharpier.Tests/CodeFormatterTests.cs
@@ -62,6 +62,42 @@ public void Format_Should_Use_Width()
         result.Code.Should().Be("var someVariable =\n    someValue;\n");
     }
 
+    [Test]
+    public void Format_Should_Use_IndentStyle()
+    {
+        var code = "void someMethod() { var someVariable = someValue; }";
+        var result = CodeFormatter.Format(
+            code,
+            new CodeFormatterOptions { IndentStyle = IndentStyle.Tabs, IndentSize = 1 }
+        );
+
+        result.Code.Should().Be("void someMethod()\n{\n\tvar someVariable = someValue;\n}\n");
+    }
+
+    [Test]
+    public void Format_Should_Use_IndentWidth()
+    {
+        var code = "void someMethod() { var someVariable = someValue; }";
+        var result = CodeFormatter.Format(
+            code,
+            new CodeFormatterOptions { IndentStyle = IndentStyle.Spaces, IndentSize = 1 }
+        );
+
+        result.Code.Should().Be("void someMethod()\n{\n var someVariable = someValue;\n}\n");
+    }
+
+    [Test]
+    public void Format_Should_Use_EndOfLine()
+    {
+        var code = "var someVariable = someValue;";
+        var result = CodeFormatter.Format(
+            code,
+            new CodeFormatterOptions { EndOfLine = EndOfLine.CRLF }
+        );
+
+        result.Code.Should().Be("var someVariable = someValue;\r\n");
+    }
+
     [TestCase("\n")]
     [TestCase("\r\n")]
     public void Format_Should_Get_Line_Endings_With_SyntaxTree(string lineEnding)
diff --git a/Src/CSharpier/CodeFormatter.cs b/Src/CSharpier/CodeFormatter.cs
@@ -21,7 +21,13 @@ public static Task<CodeFormatterResult> FormatAsync(
 
         return CSharpFormatter.FormatAsync(
             code,
-            new PrinterOptions { Width = options.Width },
+            new PrinterOptions
+            {
+                Width = options.Width,
+                UseTabs = options.IndentStyle == IndentStyle.Tabs,
+                TabWidth = options.IndentSize,
+                EndOfLine = options.EndOfLine
+            },
             cancellationToken
         );
     }
@@ -44,7 +50,13 @@ public static Task<CodeFormatterResult> FormatAsync(
 
         return CSharpFormatter.FormatAsync(
             syntaxTree,
-            new PrinterOptions { Width = options.Width },
+            new PrinterOptions
+            {
+                Width = options.Width,
+                UseTabs = options.IndentStyle == IndentStyle.Tabs,
+                TabWidth = options.IndentSize,
+                EndOfLine = options.EndOfLine
+            },
             SourceCodeKind.Regular,
             cancellationToken
         );
diff --git a/Src/CSharpier/CodeFormatterOptions.cs b/Src/CSharpier/CodeFormatterOptions.cs
@@ -3,4 +3,13 @@ namespace CSharpier;
 public class CodeFormatterOptions
 {
     public int Width { get; init; } = 100;
+    public IndentStyle IndentStyle { get; init; } = IndentStyle.Spaces;
+    public int IndentSize { get; init; } = 4;
+    public EndOfLine EndOfLine { get; init; } = EndOfLine.Auto;
+}
+
+public enum IndentStyle
+{
+    Spaces,
+    Tabs
 }
diff --git a/Src/CSharpier/EndOfLine.cs b/Src/CSharpier/EndOfLine.cs
@@ -0,0 +1,8 @@
+namespace CSharpier;
+
+public enum EndOfLine
+{
+    Auto,
+    CRLF,
+    LF
+}
diff --git a/Src/CSharpier/PrinterOptions.cs b/Src/CSharpier/PrinterOptions.cs
@@ -33,10 +33,3 @@ internal static string GetLineEnding(string code, PrinterOptions printerOptions)
         return "\n";
     }
 }
-
-internal enum EndOfLine
-{
-    Auto,
-    CRLF,
-    LF
-}
diff --git a/Src/CSharpier/PublicAPI.Unshipped.txt b/Src/CSharpier/PublicAPI.Unshipped.txt
@@ -1 +1,13 @@
-﻿
+﻿CSharpier.CodeFormatterOptions.EndOfLine.get -> CSharpier.EndOfLine
+CSharpier.CodeFormatterOptions.EndOfLine.init -> void
+CSharpier.CodeFormatterOptions.IndentSize.get -> int
+CSharpier.CodeFormatterOptions.IndentSize.init -> void
+CSharpier.CodeFormatterOptions.IndentStyle.get -> CSharpier.IndentStyle
+CSharpier.CodeFormatterOptions.IndentStyle.init -> void
+CSharpier.EndOfLine
+CSharpier.EndOfLine.Auto = 0 -> CSharpier.EndOfLine
+CSharpier.EndOfLine.CRLF = 1 -> CSharpier.EndOfLine
+CSharpier.EndOfLine.LF = 2 -> CSharpier.EndOfLine
+CSharpier.IndentStyle
+CSharpier.IndentStyle.Spaces = 0 -> CSharpier.IndentStyle
+CSharpier.IndentStyle.Tabs = 1 -> CSharpier.IndentStyle

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,13 @@ namespace CSharpier;`
`3`	`3`	`public class CodeFormatterOptions`
`4`	`4`	`{`
`5`	`5`	`public int Width { get; init; } = 100;`
	`6`	`+ public IndentStyle IndentStyle { get; init; } = IndentStyle.Spaces;`
	`7`	`+ public int IndentSize { get; init; } = 4;`
	`8`	`+ public EndOfLine EndOfLine { get; init; } = EndOfLine.Auto;`
	`9`	`+}`
	`10`	`+`
	`11`	`+public enum IndentStyle`
	`12`	`+{`
	`13`	`+ Spaces,`
	`14`	`+ Tabs`
`6`	`15`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +namespace CSharpier;
++
 +public enum EndOfLine
 +{
 +    Auto,
 +    CRLF,
 +    LF
 +}
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,3 @@ internal static string GetLineEnding(string code, PrinterOptions printerOptions)`
`33`	`33`	`return "\n";`
`34`	`34`	`}`
`35`	`35`	`}`
`36`		`-`
`37`		`-internal enum EndOfLine`
`38`		`-{`
`39`		`- Auto,`
`40`		`- CRLF,`
`41`		`- LF`
`42`		`-}`