Format with 29 (#1322)

belav · Aug 17, 2024 · 6cb3821 · 6cb3821
1 parent 0abbc1d
commit 6cb3821
Show file tree

Hide file tree

Showing 67 changed files with 198 additions and 199 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.28.1",
+      "version": "0.29.0",
       "commands": [
         "dotnet-csharpier"
       ]

diff --git a/Src/CSharpier.Cli.Tests/ServerTests.cs b/Src/CSharpier.Cli.Tests/ServerTests.cs
@@ -45,7 +45,7 @@ public async Task Stuff()
             var data = new FormatFileParameter
             {
                 fileName = "/Temp/test.cs",
-                fileContents = "public class TestClass    { }"
+                fileContents = "public class TestClass    { }",
             };
 
             var response = await httpClient.PostAsJsonAsync(

diff --git a/Src/CSharpier.Cli/CommandLineOptions.cs b/Src/CSharpier.Cli/CommandLineOptions.cs
@@ -45,7 +45,7 @@ public static RootCommand Create()
             {
                 Arity = ArgumentArity.ZeroOrMore,
                 Description =
-                    "One or more paths to a directory containing C# files to format or a C# file to format. It may be ommited when piping data via stdin."
+                    "One or more paths to a directory containing C# files to format or a C# file to format. It may be ommited when piping data via stdin.",
             }.LegalFilePathsOnly(),
             new Option(
                 new[] { "--check" },
@@ -99,7 +99,7 @@ public static RootCommand Create()
             new Option(
                 new[] { "--compilation-errors-as-warnings" },
                 "Treat compilation errors from files as warnings instead of errors."
-            )
+            ),
         };
 
         rootCommand.AddValidator(cmd =>

diff --git a/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs b/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs
@@ -20,7 +20,7 @@ internal static class ConfigFileParser
             AllowDuplicateSections = true,
             OverrideDuplicateKeys = true,
             SkipInvalidLines = true,
-            ThrowExceptionsOnError = false
+            ThrowExceptionsOnError = false,
         };
 
     public static ConfigFile Parse(string filePath, IFileSystem fileSystem)
@@ -44,7 +44,7 @@ public static ConfigFile Parse(string filePath, IFileSystem fileSystem)
         return new ConfigFile
         {
             IsRoot = configData?.Global["root"] == "true",
-            Sections = sections
+            Sections = sections,
         };
     }
 }
diff --git a/Src/CSharpier.Cli/EditorConfig/EditorConfigParser.cs b/Src/CSharpier.Cli/EditorConfig/EditorConfigParser.cs
@@ -59,7 +59,7 @@ IgnoreFile ignoreFile
                 return new EditorConfigSections
                 {
                     DirectoryName = dirName,
-                    SectionsIncludingParentFiles = FindSections(o.FullName, fileSystem)
+                    SectionsIncludingParentFiles = FindSections(o.FullName, fileSystem),
                 };
             })
             .OrderByDescending(o => o.DirectoryName.Length)

diff --git a/Src/CSharpier.Cli/EditorConfig/Globber.cs b/Src/CSharpier.Cli/EditorConfig/Globber.cs
@@ -23,7 +23,7 @@ private static string FixGlob(string glob, string directory)
         {
             -1 => "**/" + glob,
             0 => glob[1..],
-            _ => glob
+            _ => glob,
         };
         directory = directory.Replace(@"\", "/");
         if (!directory.EndsWith("/"))

diff --git a/Src/CSharpier.Cli/FileToFormatInfo.cs b/Src/CSharpier.Cli/FileToFormatInfo.cs
@@ -31,7 +31,7 @@ CancellationToken cancellationToken
             Path = path,
             FileContents = fileContents,
             Encoding = encoding,
-            UnableToDetectEncoding = unableToDetectEncoding
+            UnableToDetectEncoding = unableToDetectEncoding,
         };
     }
 
@@ -41,7 +41,7 @@ public static FileToFormatInfo Create(string path, string fileContents, Encoding
         {
             Path = path,
             FileContents = fileContents,
-            Encoding = encoding
+            Encoding = encoding,
         };
     }
 }
diff --git a/Src/CSharpier.Cli/IgnoreFile.cs b/Src/CSharpier.Cli/IgnoreFile.cs
@@ -9,7 +9,7 @@ internal class IgnoreFile
     private static readonly string[] alwaysIgnored =
     {
         "**/node_modules/**/*.cs",
-        "**/obj/**/*.cs"
+        "**/obj/**/*.cs",
     };
 
     protected IgnoreFile(Ignore.Ignore ignore, string ignoreBaseDirectoryPath)

diff --git a/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs b/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs
@@ -26,7 +26,7 @@ internal class ConfigurationFileOptions
                 UseTabs = matchingOverride.UseTabs,
                 Width = matchingOverride.PrintWidth,
                 EndOfLine = matchingOverride.EndOfLine,
-                Formatter = matchingOverride.Formatter
+                Formatter = matchingOverride.Formatter,
             };
         }
 
@@ -38,7 +38,7 @@ internal class ConfigurationFileOptions
                 UseTabs = this.UseTabs,
                 Width = this.PrintWidth,
                 EndOfLine = this.EndOfLine,
-                Formatter = "csharp"
+                Formatter = "csharp",
             };
         }
 

diff --git a/Src/CSharpier.Cli/Options/OptionsProvider.cs b/Src/CSharpier.Cli/Options/OptionsProvider.cs
@@ -130,7 +130,7 @@ public string Serialize()
             {
                 specified = this.specifiedConfigFile,
                 csharpierConfigs = this.csharpierConfigs,
-                editorConfigs = this.editorConfigs
+                editorConfigs = this.editorConfigs,
             }
         );
     }

diff --git a/Src/CSharpier.Cli/PipeMultipleFilesFormatter.cs b/Src/CSharpier.Cli/PipeMultipleFilesFormatter.cs
@@ -54,20 +54,18 @@ CancellationToken cancellationToken
                 {
                     DirectoryOrFilePaths = new[]
                     {
-                        Path.Combine(Directory.GetCurrentDirectory(), fileName)
+                        Path.Combine(Directory.GetCurrentDirectory(), fileName),
                     },
                     OriginalDirectoryOrFilePaths = new[]
                     {
-                        Path.IsPathRooted(fileName)
-                            ? fileName
-                            : fileName.StartsWith(".")
-                                ? fileName
-                                : "./" + fileName
+                        Path.IsPathRooted(fileName) ? fileName
+                        : fileName.StartsWith(".") ? fileName
+                        : "./" + fileName,
                     },
                     StandardInFileContents = stringBuilder.ToString(),
                     Fast = true,
                     WriteStdout = true,
-                    ConfigPath = configPath
+                    ConfigPath = configPath,
                 };
 
                 try

diff --git a/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs b/Src/CSharpier.Cli/Server/CSharpierServiceImplementation.cs
@@ -60,7 +60,7 @@ CancellationToken cancellationToken
             DebugLogger.Log(ex.ToString());
             return new FormatFileResult(Status.Failed)
             {
-                errorMessage = "An exception was thrown\n" + ex
+                errorMessage = "An exception was thrown\n" + ex,
             };
         }
     }

diff --git a/Src/CSharpier.Cli/Server/Status.cs b/Src/CSharpier.Cli/Server/Status.cs
@@ -5,5 +5,5 @@ public enum Status
     Formatted,
     Ignored,
     Failed,
-    UnsupportedFile
+    UnsupportedFile,
 }
diff --git a/Src/CSharpier.FakeGenerators/Ignored.cs b/Src/CSharpier.FakeGenerators/Ignored.cs
@@ -18,7 +18,7 @@ public static class Ignored
         "isStructuredTrivia",
         "hasStructuredTrivia",
         "containsSkippedText",
-        "containsAnnotations"
+        "containsAnnotations",
     };
 
     public static readonly Type[] Types = { typeof(TextSpan), typeof(SyntaxTree) };

diff --git a/Src/CSharpier.Generators/NodePrinterGenerator.cs b/Src/CSharpier.Generators/NodePrinterGenerator.cs
@@ -19,7 +19,7 @@ protected override object GetModel(GeneratorExecutionContext context)
             {
                 PrinterName = fileName,
                 SyntaxNodeName = fileName + "Syntax",
-                VariableName = char.ToLower(fileName[0]) + fileName[1..]
+                VariableName = char.ToLower(fileName[0]) + fileName[1..],
             })
             .OrderBy(o => o.SyntaxNodeName)
             .ToArray();

diff --git a/Src/CSharpier.Playground/Controllers/FormatController.cs b/Src/CSharpier.Playground/Controllers/FormatController.cs
@@ -69,7 +69,7 @@ CancellationToken cancellationToken
                 IncludeDocTree = true,
                 Width = model.PrintWidth,
                 IndentSize = model.IndentSize,
-                UseTabs = model.UseTabs
+                UseTabs = model.UseTabs,
             },
             sourceCodeKind,
             cancellationToken
@@ -90,14 +90,14 @@ CancellationToken cancellationToken
             Json = result.AST,
             Doc = result.DocTree,
             Errors = result.CompilationErrors.Select(this.ConvertError).ToList(),
-            SyntaxValidation = await comparer.CompareSourceAsync(CancellationToken.None)
+            SyntaxValidation = await comparer.CompareSourceAsync(CancellationToken.None),
         };
     }
 
     private FormatError ConvertError(Diagnostic diagnostic)
     {
         var lineSpan = diagnostic.Location.SourceTree!.GetLineSpan(diagnostic.Location.SourceSpan);
-        return new FormatError { LineSpan = lineSpan, Description = diagnostic.ToString(), };
+        return new FormatError { LineSpan = lineSpan, Description = diagnostic.ToString() };
     }
 
     public string ExecuteApplication(string pathToExe, string workingDirectory, string args)
@@ -108,7 +108,7 @@ public string ExecuteApplication(string pathToExe, string workingDirectory, stri
             RedirectStandardError = true,
             WindowStyle = ProcessWindowStyle.Hidden,
             WorkingDirectory = workingDirectory,
-            CreateNoWindow = true
+            CreateNoWindow = true,
         };
 
         var process = Process.Start(processStartInfo);

diff --git a/Src/CSharpier.Tests.Generators/FormattingTestsGenerator.cs b/Src/CSharpier.Tests.Generators/FormattingTestsGenerator.cs
@@ -20,7 +20,7 @@ protected override object GetModel(GeneratorExecutionContext context)
             {
                 Name = Path.GetFileNameWithoutExtension(o.Path),
                 FileExtension = new FileInfo(o.Path).Directory!.Name,
-                UseTabs = Path.GetFileNameWithoutExtension(o.Path).EndsWith("_Tabs")
+                UseTabs = Path.GetFileNameWithoutExtension(o.Path).EndsWith("_Tabs"),
             });
 
         return new { Tests = tests };

diff --git a/Src/CSharpier.Tests/CSharpierIgnoreTests.cs b/Src/CSharpier.Tests/CSharpierIgnoreTests.cs
@@ -71,7 +71,7 @@ private string PrintWithoutFormatting(string code)
                 {
                     LineEnding = Environment.NewLine,
                     IndentSize = 4,
-                    UseTabs = false
+                    UseTabs = false,
                 }
             )
             .ReplaceLineEndings("\n");

diff --git a/Src/CSharpier.Tests/DocPrinterTests.cs b/Src/CSharpier.Tests/DocPrinterTests.cs
@@ -848,7 +848,7 @@ private static string Print(
                 {
                     Width = width,
                     TrimInitialLines = trimInitialLines,
-                    UseTabs = useTabs
+                    UseTabs = useTabs,
                 },
                 Environment.NewLine
             )

diff --git a/Src/CSharpier.Tests/MissingTypeChecker.cs b/Src/CSharpier.Tests/MissingTypeChecker.cs
@@ -113,6 +113,6 @@ public void Ensure_There_Are_No_Missing_Types()
             "XmlNameAttributeSyntax",
             "XmlNameSyntax",
             "XmlPrefixSyntax",
-            "XmlTextAttributeSyntax"
+            "XmlTextAttributeSyntax",
         };
 }
diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierOptions.cs
@@ -171,7 +171,7 @@ async Task SaveOptions(Func<Task<string?>> getFilePath, OptionsDto optionsDto)
 
             await SaveOptions(
                 this.GetSolutionOptionsFileNameAsync,
-                new OptionsDto { RunOnSave = this.SolutionRunOnSave, }
+                new OptionsDto { RunOnSave = this.SolutionRunOnSave }
             );
 
             await SaveOptions(

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessPipeMultipleFiles.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessPipeMultipleFiles.cs
@@ -51,7 +51,7 @@ private void StartProcess()
                     StandardErrorEncoding = Encoding.UTF8,
                     UseShellExecute = false,
                     CreateNoWindow = true,
-                    EnvironmentVariables = { ["DOTNET_NOLOGO"] = "1" }
+                    EnvironmentVariables = { ["DOTNET_NOLOGO"] = "1" },
                 };
                 this.process = new Process { StartInfo = processStartInfo };
                 this.process.Start();

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessProvider.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessProvider.cs
@@ -312,10 +312,10 @@ private void DisplayFailureMessage()
                         new ProcessStartInfo
                         {
                             FileName = "https://csharpier.com/docs/EditorsTroubleshooting",
-                            UseShellExecute = true
+                            UseShellExecute = true,
                         }
                     );
-                }
+                },
             };
 
             InfoBarService.Instance.ShowInfoBar(

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessServer.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessServer.cs
@@ -52,7 +52,7 @@ private bool StartProcess()
                 RedirectStandardError = true,
                 UseShellExecute = false,
                 CreateNoWindow = true,
-                Environment = { ["DOTNET_NOLOGO"] = "1" }
+                Environment = { ["DOTNET_NOLOGO"] = "1" },
             };
             this.process = Process.Start(processStartInfo);
 

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessSingleFile.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/CSharpierProcessSingleFile.cs
@@ -29,7 +29,7 @@ public string FormatFile(string content, string fileName)
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
                 UseShellExecute = false,
-                CreateNoWindow = true
+                CreateNoWindow = true,
             };
             processStartInfo.EnvironmentVariables["DOTNET_NOLOGO"] = "1";
 

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/FormattingService.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/FormattingService.cs
@@ -73,7 +73,7 @@ void UpdateText(string formattedText)
                 var parameter = new FormatFileParameter
                 {
                     fileContents = text,
-                    fileName = document.FullName
+                    fileName = document.FullName,
                 };
                 var result = csharpierProcess2.formatFile(parameter);
 

diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/ICSharpierProcess.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/ICSharpierProcess.cs
@@ -30,6 +30,6 @@ public enum Status
     {
         Formatted,
         Ignored,
-        Failed
+        Failed,
     }
 }
diff --git a/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/InstallerService.cs b/Src/CSharpier.VisualStudio/CSharpier.VisualStudioShared/InstallerService.cs
@@ -67,8 +67,8 @@ IProcessKiller processKiller
                         this.logger.Debug("Installing CSharpier globally");
                         ProcessHelper.ExecuteCommand("dotnet", "tool install -g csharpier");
                         processKiller.KillRunningProcesses();
-                    }
-                }
+                    },
+                },
             };
 
             if (!isOnlyGlobal)
@@ -101,7 +101,7 @@ IProcessKiller processKiller
                                 solutionBasePath
                             );
                             processKiller.KillRunningProcesses();
-                        }
+                        },
                     }
                 );
             }

diff --git a/Src/CSharpier/CSharpFormatter.cs b/Src/CSharpier/CSharpFormatter.cs
@@ -102,7 +102,7 @@ bool TryGetCompilationFailure(out CodeFormatterResult compilationResult)
                 {
                     Code = syntaxTree.ToString(),
                     CompilationErrors = diagnostics,
-                    AST = printerOptions.IncludeAST ? PrintAST(rootNode) : string.Empty
+                    AST = printerOptions.IncludeAST ? PrintAST(rootNode) : string.Empty,
                 };
 
                 return true;
@@ -172,7 +172,7 @@ await syntaxTree.GetRootAsync(cancellationToken),
         {
             return new CodeFormatterResult
             {
-                FailureMessage = "We can't handle this deep of recursion yet."
+                FailureMessage = "We can't handle this deep of recursion yet.",
             };
         }
     }

diff --git a/Src/CSharpier/CodeFormatter.cs b/Src/CSharpier/CodeFormatter.cs
@@ -28,7 +28,7 @@ public static Task<CodeFormatterResult> FormatAsync(
                 IndentSize = options.IndentSize,
                 EndOfLine = options.EndOfLine,
                 IncludeGenerated = options.IncludeGenerated,
-                Formatter = "csharp"
+                Formatter = "csharp",
             },
             cancellationToken
         );
@@ -58,7 +58,7 @@ public static Task<CodeFormatterResult> FormatAsync(
                 UseTabs = options.IndentStyle == IndentStyle.Tabs,
                 IndentSize = options.IndentSize,
                 EndOfLine = options.EndOfLine,
-                Formatter = "csharp"
+                Formatter = "csharp",
             },
             SourceCodeKind.Regular,
             cancellationToken

diff --git a/Src/CSharpier/CodeFormatterOptions.cs b/Src/CSharpier/CodeFormatterOptions.cs
@@ -12,5 +12,5 @@ public class CodeFormatterOptions
 public enum IndentStyle
 {
     Spaces,
-    Tabs
+    Tabs,
 }
diff --git a/Src/CSharpier/DocPrinter/DocFitter.cs b/Src/CSharpier/DocPrinter/DocFitter.cs
@@ -33,7 +33,7 @@ void Push(Doc doc, PrintMode printMode, Indent indent)
             var (currentIndent, currentMode, currentDoc) = newCommands switch
             {
                 { Count: > 0 } => newCommands.Pop(),
-                _ => remainingCommands.ElementAt(x++)
+                _ => remainingCommands.ElementAt(x++),
             };
 
             switch (currentDoc)
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,6 @@ public enum Status @@
         {
             Formatted,
             Ignored,
-            Failed
+            Failed,
         }
     }