format with 0.27.0

belav · Jan 21, 2024 · 56ff119 · 56ff119
1 parent cedd480
commit 56ff119
Show file tree

Hide file tree

Showing 36 changed files with 211 additions and 279 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.26.0",
+      "version": "0.27.0",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/Src/CSharpier.Cli.Tests/CliTests.cs b/Src/CSharpier.Cli.Tests/CliTests.cs
@@ -126,8 +126,7 @@ public async Task Should_Return_Error_When_No_DirectoryOrFile_And_Not_Piping_Std
 
         result.ExitCode.Should().Be(1);
         result
-            .ErrorOutput
-            .Should()
+            .ErrorOutput.Should()
             .Contain("directoryOrFile is required when not piping stdin to CSharpier");
     }
 
@@ -202,8 +201,7 @@ public async Task Should_Print_NotFound()
 
         result.Output.Should().BeEmpty();
         result
-            .ErrorOutput
-            .Should()
+            .ErrorOutput.Should()
             .StartWith("There was no file or directory found at /BasicFile.cs");
         result.ExitCode.Should().Be(1);
     }
@@ -232,8 +230,7 @@ public async Task With_Check_Should_Write_Unformatted_File()
             .ExecuteAsync();
 
         result
-            .ErrorOutput
-            .Replace("\\", "/")
+            .ErrorOutput.Replace("\\", "/")
             .Should()
             .StartWith("Error ./CheckUnformatted.cs - Was not formatted.");
         result.ExitCode.Should().Be(1);
@@ -276,8 +273,7 @@ public async Task Should_Write_Error_With_Multiple_Piped_Files(string input, str
             .ExecuteAsync();
 
         result
-            .ErrorOutput
-            .Should()
+            .ErrorOutput.Should()
             .StartWith(
                 $"Error {output} - Failed to compile so was not formatted.{Environment.NewLine}  (1,26): error CS1513: }}"
             );
@@ -376,8 +372,7 @@ await this.WriteFileAsync(
         var result = await new CsharpierProcess().WithArguments(".").ExecuteAsync();
 
         result
-            .ErrorOutput
-            .Should()
+            .ErrorOutput.Should()
             .Contain("uses version 99 of CSharpier.MsBuild which is a mismatch with version");
         result.ExitCode.Should().Be(1);
     }
@@ -540,8 +535,7 @@ public CsharpierProcess()
             var path = Path.Combine(Directory.GetCurrentDirectory(), "dotnet-csharpier.dll");
 
             this.command = CliWrap
-                .Cli
-                .Wrap("dotnet")
+                .Cli.Wrap("dotnet")
                 .WithArguments(path)
                 .WithWorkingDirectory(testFileDirectory)
                 .WithValidation(CommandResultValidation.None)

diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -238,8 +238,11 @@ await FormatPhysicalFile(
                 }
 
                 var tasks = fileSystem
-                    .Directory
-                    .EnumerateFiles(directoryOrFilePath, "*.cs", SearchOption.AllDirectories)
+                    .Directory.EnumerateFiles(
+                        directoryOrFilePath,
+                        "*.cs",
+                        SearchOption.AllDirectories
+                    )
                     .Select(o =>
                     {
                         var normalizedPath = o.Replace("\\", "/");

diff --git a/Src/CSharpier.Cli/EditorConfig/EditorConfigParser.cs b/Src/CSharpier.Cli/EditorConfig/EditorConfigParser.cs
@@ -39,9 +39,9 @@ IgnoreFile ignoreFile
 
         while (directoryInfo is not null)
         {
-            var file = fileSystem
-                .FileInfo
-                .New(fileSystem.Path.Combine(directoryInfo.FullName, ".editorconfig"));
+            var file = fileSystem.FileInfo.New(
+                fileSystem.Path.Combine(directoryInfo.FullName, ".editorconfig")
+            );
             if (file.Exists)
             {
                 editorConfigFiles.Add(file);

diff --git a/Src/CSharpier.Cli/FormattingCache.cs b/Src/CSharpier.Cli/FormattingCache.cs
@@ -148,14 +148,12 @@ public async Task ResolveAsync(CancellationToken cancellationToken)
 
             async Task WriteFile()
             {
-                await using var fileStream = this.fileSystem
-                    .File
-                    .Open(
-                        this.cacheFile,
-                        FileMode.OpenOrCreate,
-                        FileAccess.ReadWrite,
-                        FileShare.None
-                    );
+                await using var fileStream = this.fileSystem.File.Open(
+                    this.cacheFile,
+                    FileMode.OpenOrCreate,
+                    FileAccess.ReadWrite,
+                    FileShare.None
+                );
                 await using var streamWriter = new StreamWriter(fileStream);
                 await streamWriter.WriteAsync(
                     JsonSerializer.Serialize(

diff --git a/Src/CSharpier.Cli/HasMismatchedCliAndMsBuildVersions.cs b/Src/CSharpier.Cli/HasMismatchedCliAndMsBuildVersions.cs
@@ -10,15 +10,12 @@ public static class HasMismatchedCliAndMsBuildVersions
     public static bool Check(string directoryName, IFileSystem fileSystem, ILogger logger)
     {
         var csProjPaths = fileSystem
-            .Directory
-            .EnumerateFiles(directoryName, "*.csproj", SearchOption.AllDirectories)
+            .Directory.EnumerateFiles(directoryName, "*.csproj", SearchOption.AllDirectories)
             .ToArray();
 
         var versionOfDotnetTool = typeof(CommandLineFormatter)
-            .Assembly
-            .GetName()
-            .Version!
-            .ToString(3);
+            .Assembly.GetName()
+            .Version!.ToString(3);
 
         string? GetPackagesVersion(string pathToCsProj)
         {

diff --git a/Src/CSharpier.Cli/IgnoreFile.cs b/Src/CSharpier.Cli/IgnoreFile.cs
@@ -89,9 +89,10 @@ var line in await fileSystem.File.ReadAllLinesAsync(ignoreFilePath, cancellation
         var directoryInfo = fileSystem.DirectoryInfo.New(baseDirectoryPath);
         while (directoryInfo != null)
         {
-            var ignoreFilePath = fileSystem
-                .Path
-                .Combine(directoryInfo.FullName, ".csharpierignore");
+            var ignoreFilePath = fileSystem.Path.Combine(
+                directoryInfo.FullName,
+                ".csharpierignore"
+            );
             if (fileSystem.File.Exists(ignoreFilePath))
             {
                 return ignoreFilePath;

diff --git a/Src/CSharpier.Cli/Options/OptionsProvider.cs b/Src/CSharpier.Cli/Options/OptionsProvider.cs
@@ -89,11 +89,11 @@ public PrinterOptions GetPrinterOptionsFor(string filePath)
 
         ArgumentNullException.ThrowIfNull(directoryName);
 
-        var resolvedEditorConfig = this.editorConfigs.FirstOrDefault(
-            o => directoryName.StartsWith(o.DirectoryName)
+        var resolvedEditorConfig = this.editorConfigs.FirstOrDefault(o =>
+            directoryName.StartsWith(o.DirectoryName)
         );
-        var resolvedCSharpierConfig = this.csharpierConfigs.FirstOrDefault(
-            o => directoryName.StartsWith(o.DirectoryName)
+        var resolvedCSharpierConfig = this.csharpierConfigs.FirstOrDefault(o =>
+            directoryName.StartsWith(o.DirectoryName)
         );
 
         if (resolvedEditorConfig is null && resolvedCSharpierConfig is null)

diff --git a/Src/CSharpier.Cli/PhysicalFileInfoAndWriter.cs b/Src/CSharpier.Cli/PhysicalFileInfoAndWriter.cs
@@ -15,9 +15,11 @@ public void WriteResult(CodeFormatterResult result, FileToFormatInfo fileToForma
     {
         if (result.Code != fileToFormatInfo.FileContents)
         {
-            this.FileSystem
-                .File
-                .WriteAllText(fileToFormatInfo.Path, result.Code, fileToFormatInfo.Encoding);
+            this.FileSystem.File.WriteAllText(
+                fileToFormatInfo.Path,
+                result.Code,
+                fileToFormatInfo.Encoding
+            );
         }
     }
 }
diff --git a/Src/CSharpier.Cli/Program.cs b/Src/CSharpier.Cli/Program.cs
@@ -84,12 +84,11 @@ CancellationToken cancellationToken
         else
         {
             directoryOrFile = directoryOrFile!
-                .Select(
-                    o =>
-                        o == "."
-                            // .csharpierignore gets confused by . so just don't include it
-                            ? Directory.GetCurrentDirectory()
-                            : Path.Combine(Directory.GetCurrentDirectory(), o)
+                .Select(o =>
+                    o == "."
+                        // .csharpierignore gets confused by . so just don't include it
+                        ? Directory.GetCurrentDirectory()
+                        : Path.Combine(Directory.GetCurrentDirectory(), o)
                 )
                 .ToArray();
         }

diff --git a/Src/CSharpier.FakeGenerators/ValidNodeTypes.cs b/Src/CSharpier.FakeGenerators/ValidNodeTypes.cs
@@ -8,13 +8,11 @@ public static class ValidNodeTypes
     public static IList<Type> Get()
     {
         return typeof(CompilationUnitSyntax)
-            .Assembly
-            .GetTypes()
-            .Where(
-                o =>
-                    !o.IsAbstract
-                    && typeof(CSharpSyntaxNode).IsAssignableFrom(o)
-                    && !Ignored.UnsupportedNodes.Contains(o.Name)
+            .Assembly.GetTypes()
+            .Where(o =>
+                !o.IsAbstract
+                && typeof(CSharpSyntaxNode).IsAssignableFrom(o)
+                && !Ignored.UnsupportedNodes.Contains(o.Name)
             )
             .OrderBy(o => o.Name)
             .ToList();

diff --git a/Src/CSharpier.Generators/NodePrinterGenerator.cs b/Src/CSharpier.Generators/NodePrinterGenerator.cs
@@ -13,19 +13,14 @@ public class NodePrinterGenerator : TemplatedGenerator
     protected override object GetModel(GeneratorExecutionContext context)
     {
         var nodeTypes = context
-            .Compilation
-            .SyntaxTrees
-            .Where(o => o.FilePath.Contains("SyntaxNodePrinters"))
+            .Compilation.SyntaxTrees.Where(o => o.FilePath.Contains("SyntaxNodePrinters"))
             .Select(o => Path.GetFileNameWithoutExtension(o.FilePath))
-            .Select(
-                fileName =>
-                    new
-                    {
-                        PrinterName = fileName,
-                        SyntaxNodeName = fileName + "Syntax",
-                        VariableName = char.ToLower(fileName[0]) + fileName[1..]
-                    }
-            )
+            .Select(fileName => new
+            {
+                PrinterName = fileName,
+                SyntaxNodeName = fileName + "Syntax",
+                VariableName = char.ToLower(fileName[0]) + fileName[1..]
+            })
             .OrderBy(o => o.SyntaxNodeName)
             .ToArray();
 

diff --git a/Src/CSharpier.Tests.Generators/FormattingTestsGenerator.cs b/Src/CSharpier.Tests.Generators/FormattingTestsGenerator.cs
@@ -11,22 +11,17 @@ public class FormattingTestsGenerator : TemplatedGenerator
     protected override object GetModel(GeneratorExecutionContext context)
     {
         var tests = context
-            .AdditionalFiles
-            .Where(
-                o =>
-                    o.Path.EndsWith(".test")
-                    && !o.Path.EndsWith(".actual.test")
-                    && !o.Path.EndsWith(".expected.test")
+            .AdditionalFiles.Where(o =>
+                o.Path.EndsWith(".test")
+                && !o.Path.EndsWith(".actual.test")
+                && !o.Path.EndsWith(".expected.test")
             )
-            .Select(
-                o =>
-                    new
-                    {
-                        Name = Path.GetFileNameWithoutExtension(o.Path),
-                        FileExtension = new FileInfo(o.Path).Directory!.Name,
-                        UseTabs = Path.GetFileNameWithoutExtension(o.Path).EndsWith("_Tabs")
-                    }
-            );
+            .Select(o => new
+            {
+                Name = Path.GetFileNameWithoutExtension(o.Path),
+                FileExtension = new FileInfo(o.Path).Directory!.Name,
+                UseTabs = Path.GetFileNameWithoutExtension(o.Path).EndsWith("_Tabs")
+            });
 
         return new { Tests = tests };
     }

diff --git a/Src/CSharpier.Tests/CommandLineFormatterTests.cs b/Src/CSharpier.Tests/CommandLineFormatterTests.cs
@@ -25,8 +25,7 @@ public void Format_Writes_Failed_To_Compile()
         var result = this.Format(context);
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be("Warning ./Invalid.cs - Failed to compile so was not formatted.");
     }
@@ -40,8 +39,7 @@ public void Format_Writes_Failed_To_Compile_For_Subdirectory()
         var result = this.Format(context, directoryOrFilePaths: "Subdirectory");
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be("Warning ./Subdirectory/Invalid.cs - Failed to compile so was not formatted.");
     }
@@ -58,8 +56,7 @@ public void Format_Writes_Failed_To_Compile_For_FullPath()
         );
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be(
                 $"Warning {context.GetRootPath().Replace('\\', '/')}/Subdirectory/Invalid.cs - Failed to compile so was not formatted."
@@ -75,8 +72,7 @@ public void Format_Writes_Failed_To_Compile_With_Directory()
         var result = this.Format(context);
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be("Warning ./Directory/Invalid.cs - Failed to compile so was not formatted.");
     }
@@ -90,8 +86,7 @@ public void Format_Writes_Unsupported()
         var result = this.Format(context, directoryOrFilePaths: "Unsupported.js");
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be(@"Warning ./Unsupported.js - Is an unsupported file type.");
     }
@@ -139,8 +134,7 @@ public void Works_With_MSBuild_Version_Checking(string version, bool shouldPass)
         {
             result.ExitCode.Should().Be(1);
             result
-                .ErrorOutputLines
-                .First()
+                .ErrorOutputLines.First()
                 .Should()
                 .EndWith(
                     $@"Test.csproj uses version {version} of CSharpier.MsBuild which is a mismatch with version {currentVersion}"
@@ -168,8 +162,7 @@ public void Works_With_MSBuild_Version_Checking_When_No_Version_Specified()
 
         result.ExitCode.Should().Be(0);
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .EndWith($"Test.csproj uses an unknown version of CSharpier.MsBuild");
     }
@@ -218,8 +211,7 @@ bool shouldPass
         {
             result.ExitCode.Should().Be(1);
             result
-                .ErrorOutputLines
-                .First()
+                .ErrorOutputLines.First()
                 .Should()
                 .EndWith(
                     $@"Test.csproj uses version {version} of CSharpier.MsBuild which is a mismatch with version {currentVersion}"
@@ -284,8 +276,7 @@ public void Format_Checks_Unformatted_File()
         result.ExitCode.Should().Be(1);
         context.GetFileContent(unformattedFilePath).Should().Be(UnformattedClassContent);
         result
-            .ErrorOutputLines
-            .First()
+            .ErrorOutputLines.First()
             .Should()
             .StartWith("Error ./Unformatted.cs - Was not formatted.");
     }
@@ -501,8 +492,7 @@ public void Ignore_Reports_Errors()
 
         result.ExitCode.Should().Be(1);
         result
-            .ErrorOutputLines
-            .First()
+            .ErrorOutputLines.First()
             .Replace("\\", "/")
             .Should()
             .Contain(
@@ -562,8 +552,7 @@ public void File_With_Compilation_Error_Should_Not_Lose_Code()
 
         context.GetFileContent("Invalid.cs").Should().Be(contents);
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Should()
             .Be("Warning ./Invalid.cs - Failed to compile so was not formatted.");
     }
@@ -620,8 +609,7 @@ public void Empty_Config_Files_Should_Log_Warning(string configFileName)
         var result = this.Format(context);
 
         result
-            .OutputLines
-            .First()
+            .OutputLines.First()
             .Replace("\\", "/")
             .Should()
             .Be($"Warning The configuration file at {configPath} was empty.");