Drastically speed up formatting when ignore or config file exist. (#597)

closes #594
belav · Feb 8, 2022 · a338a6c · a338a6c
1 parent 3f252d8
commit a338a6c
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 51 deletions.
diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -17,6 +17,31 @@ CancellationToken cancellationToken
     {
         try
         {
+            async Task<(IgnoreFile, PrinterOptions)> GetIgnoreFileAndPrinterOptions(
+                string directoryOrFile
+            )
+            {
+                var baseDirectoryPath =
+                    fileSystem.Path.GetExtension(directoryOrFile) == string.Empty
+                        ? directoryOrFile
+                        : fileSystem.Path.GetDirectoryName(directoryOrFile);
+
+                var ignoreFile = await IgnoreFile.Create(
+                    baseDirectoryPath,
+                    fileSystem,
+                    logger,
+                    cancellationToken
+                );
+
+                var printerOptions = ConfigurationFileOptions.CreatePrinterOptions(
+                    baseDirectoryPath,
+                    fileSystem,
+                    logger
+                );
+
+                return (ignoreFile, printerOptions);
+            }
+
             var stopwatch = Stopwatch.StartNew();
             var commandLineFormatterResult = new CommandLineFormatterResult();
 
@@ -29,30 +54,34 @@ CancellationToken cancellationToken
                     console.InputEncoding
                 );
 
-                var loggerAndOptions = await GetLoggerAndOptions(
-                    filePath,
-                    filePath,
-                    fileSystem,
-                    logger,
-                    cancellationToken
-                );
+                var (ignoreFile, printerOptions) = await GetIgnoreFileAndPrinterOptions(filePath);
 
-                if (loggerAndOptions != null)
+                if (
+                    !GeneratedCodeUtilities.IsGeneratedCodeFile(filePath)
+                    && !ignoreFile.IsIgnored(filePath)
+                )
                 {
+                    var fileIssueLogger = GetFileIssueLogger(
+                        filePath,
+                        filePath,
+                        fileSystem,
+                        logger
+                    );
+
                     await PerformFormattingSteps(
                         fileToFormatInfo,
                         new StdOutFormattedFileWriter(console),
                         commandLineFormatterResult,
-                        loggerAndOptions.Value.fileIssueLogger,
-                        loggerAndOptions.Value.printerOptions,
+                        fileIssueLogger,
+                        printerOptions,
                         commandLineOptions,
                         cancellationToken
                     );
                 }
             }
             else
             {
-                IFormattedFileWriter? writer = null;
+                IFormattedFileWriter? writer;
                 if (commandLineOptions.WriteStdout)
                 {
                     writer = new StdOutFormattedFileWriter(console);
@@ -72,8 +101,20 @@ var directoryOrFile in commandLineOptions.DirectoryOrFilePaths.Select(
                     )
                 )
                 {
+                    var (ignoreFile, printerOptions) = await GetIgnoreFileAndPrinterOptions(
+                        directoryOrFile
+                    );
+
                     async Task FormatFile(string filePath)
                     {
+                        if (
+                            GeneratedCodeUtilities.IsGeneratedCodeFile(filePath)
+                            || ignoreFile.IsIgnored(filePath)
+                        )
+                        {
+                            return;
+                        }
+
                         await FormatPhysicalFile(
                             filePath,
                             directoryOrFile,
@@ -82,6 +123,7 @@ await FormatPhysicalFile(
                             commandLineFormatterResult,
                             writer,
                             commandLineOptions,
+                            printerOptions,
                             cancellationToken
                         );
                     }
@@ -161,6 +203,7 @@ private static async Task FormatPhysicalFile(
         CommandLineFormatterResult commandLineFormatterResult,
         IFormattedFileWriter writer,
         CommandLineOptions commandLineOptions,
+        PrinterOptions printerOptions,
         CancellationToken cancellationToken
     )
     {
@@ -170,42 +213,30 @@ CancellationToken cancellationToken
             cancellationToken
         );
 
-        var loggerAndOptions = await GetLoggerAndOptions(
-            directoryOrFile,
-            filePath,
-            fileSystem,
-            logger,
-            cancellationToken
-        );
-
-        if (loggerAndOptions == null)
-        {
-            return;
-        }
+        var fileIssueLogger = GetFileIssueLogger(directoryOrFile, filePath, fileSystem, logger);
 
         if (!filePath.EndsWithIgnoreCase(".cs") && !filePath.EndsWithIgnoreCase(".cst"))
         {
-            loggerAndOptions.Value.fileIssueLogger.WriteError("Is an unsupported file type.");
+            fileIssueLogger.WriteError("Is an unsupported file type.");
             return;
         }
 
         await PerformFormattingSteps(
             fileToFormatInfo,
             writer,
             commandLineFormatterResult,
-            loggerAndOptions.Value.fileIssueLogger,
-            loggerAndOptions.Value.printerOptions,
+            fileIssueLogger,
+            printerOptions,
             commandLineOptions,
             cancellationToken
         );
     }
 
-    private static async Task<(FileIssueLogger fileIssueLogger, PrinterOptions printerOptions)?> GetLoggerAndOptions(
+    private static FileIssueLogger GetFileIssueLogger(
         string pathToDirectoryOrFile,
         string pathToFile,
         IFileSystem fileSystem,
-        ILogger logger,
-        CancellationToken cancellationToken
+        ILogger logger
     )
     {
         var normalizedPath = pathToDirectoryOrFile.Replace('\\', '/');
@@ -220,33 +251,12 @@ CancellationToken cancellationToken
             );
         }
 
-        var printerOptions = ConfigurationFileOptions.CreatePrinterOptions(
-            baseDirectoryPath,
-            fileSystem,
-            logger
-        );
-
-        var ignoreFile = await IgnoreFile.Create(
-            baseDirectoryPath,
-            fileSystem,
-            logger,
-            cancellationToken
-        );
-
-        if (
-            GeneratedCodeUtilities.IsGeneratedCodeFile(pathToFile)
-            || ignoreFile.IsIgnored(pathToFile)
-        )
-        {
-            return null;
-        }
-
         var filePathLogger = new FileIssueLogger(
             pathToFile.Replace('\\', '/')[baseDirectoryPath.Length..],
             logger
         );
 
-        return (filePathLogger, printerOptions);
+        return filePathLogger;
     }
 
     private static int ReturnExitCode(

diff --git a/Src/CSharpier.Cli/ConfigurationFileOptions.cs b/Src/CSharpier.Cli/ConfigurationFileOptions.cs
@@ -19,6 +19,8 @@ internal static PrinterOptions CreatePrinterOptions(
         ILogger logger
     )
     {
+        DebugLogger.Log("Creating printer options for " + baseDirectoryPath);
+
         var configurationFileOptions = Create(baseDirectoryPath, fileSystem, logger);
 
         List<string[]> preprocessorSymbolSets;

diff --git a/Src/CSharpier.Cli/IgnoreFile.cs b/Src/CSharpier.Cli/IgnoreFile.cs
@@ -42,6 +42,8 @@ public static async Task<IgnoreFile> Create(
         CancellationToken cancellationToken
     )
     {
+        DebugLogger.Log("Creating ignore file for " + baseDirectoryPath);
+
         var ignore = new Ignore.Ignore();
         var ignoreFilePath = FindIgnorePath(baseDirectoryPath, fileSystem);
         if (ignoreFilePath == null)