Merge pull request #229 from belav/formatting-with-0.9.4

formatting with 0.9.4
belav · May 24, 2021 · c6edad5 · c6edad5
2 parents bd17e4e + 36c3a08
commit c6edad5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.9.2",
+      "version": "0.9.4",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/Src/CSharpier.Tests/LineEndingTests.cs b/Src/CSharpier.Tests/LineEndingTests.cs
@@ -60,7 +60,8 @@ public void LineEndings_In_Verbatim_String_Should_Respect_Options(
             string newLine,
             EndOfLine endOfLine
         ) {
-            var code = @$"class ClassName
+            var code =
+                @$"class ClassName
 {{
     string value = @""one{newLine}two"";
 }}

diff --git a/Src/CSharpier.Tests/SyntaxNodeComparerTests.cs b/Src/CSharpier.Tests/SyntaxNodeComparerTests.cs
@@ -31,7 +31,8 @@ namespace Namespace { }
         public void Class_Not_Equal_Class_Different_Whitespace()
         {
             var left = "class ClassName { }";
-            var right = @"class ClassName {
+            var right =
+                @"class ClassName {
 }";
 
             var result = this.AreEqual(left, right);
@@ -79,7 +80,8 @@ public Resources()
     }
 }
 ";
-            var right = @"class Resources
+            var right =
+                @"class Resources
 {
     public Resources() { }
 }
@@ -156,12 +158,14 @@ public DropdownAttribute(bool ignoreIfNotPresent)
         [Test]
         public void MissingSemiColon()
         {
-            var left = @"public enum Enum
+            var left =
+                @"public enum Enum
 {
     Integer,
     String,
 };";
-            var right = @"public enum Enum
+            var right =
+                @"public enum Enum
 {
     Integer,
     String,

diff --git a/Src/CSharpier/CSharpier.csproj b/Src/CSharpier/CSharpier.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="../../CSharpier.Build.props"/>
+	<Import Project="../../CSharpier.Build.props" />
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <PackageId>CSharpier</PackageId>
@@ -15,6 +15,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="CSharpier.MsBuild" Version="0.9.4" />
         <PackageReference Include="Ignore" Version="0.1.42" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
         <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

diff --git a/Src/CSharpier/DocPrinter/PropagateBreaks.cs b/Src/CSharpier/DocPrinter/PropagateBreaks.cs
@@ -34,7 +34,7 @@ bool OnEnter(Doc doc)
                 if (
                     doc is IBreakParent && (forceFlat == 0 || (forceFlat > 0 && doc is LiteralLine))
                 ) {
-                    if (doc is HardLine { SkipBreakIfFirstInGroup: true }  && canSkipBreak)
+                    if (doc is HardLine { SkipBreakIfFirstInGroup: true } && canSkipBreak)
                     {
                         if (groupStack.Count > 1)
                         {
@@ -59,7 +59,7 @@ bool OnEnter(Doc doc)
 
                     alreadyVisitedSet.Add(group);
                 }
-                else if (doc is StringDoc { IsDirective: false } )
+                else if (doc is StringDoc { IsDirective: false })
                 {
                     canSkipBreak = false;
                 }

diff --git a/Src/CSharpier/Program.cs b/Src/CSharpier/Program.cs
@@ -33,7 +33,7 @@ public static async Task<int> Run(
             bool skipWrite,
             CancellationToken cancellationToken
         ) {
-            if (directoryOrFile is null or  { Length: 0 } )
+            if (directoryOrFile is null or { Length: 0 })
             {
                 directoryOrFile = new[] { Directory.GetCurrentDirectory() };
             }

diff --git a/Src/CSharpier/SyntaxPrinter/Token.cs b/Src/CSharpier/SyntaxPrinter/Token.cs
@@ -62,7 +62,7 @@ private static Doc PrintSyntaxToken(
                 && syntaxToken.Text.StartsWith("@"))
                 || (syntaxToken.Kind() == SyntaxKind.InterpolatedStringTextToken
                 && syntaxToken.Parent!.Parent
-                    is InterpolatedStringExpressionSyntax { StringStartToken:  { RawKind: (int)SyntaxKind.InterpolatedVerbatimStringStartToken }  } )
+                    is InterpolatedStringExpressionSyntax { StringStartToken: { RawKind: (int)SyntaxKind.InterpolatedVerbatimStringStartToken } })
             ) {
                 var lines = syntaxToken.Text.Replace("\r", string.Empty).Split(new[] { '\n' });
                 docs.Add(Doc.Join(Doc.LiteralLine, lines.Select(o => new StringDoc(o))));