Limit config searching the same way editorconfig searching is limited (…

…#1243) * Limit config searching the same way editorconfig searching is limited closes #1240 * don't forget this file
belav · Apr 26, 2024 · aea004c · aea004c
1 parent 86f6690
commit aea004c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -49,7 +49,7 @@ CancellationToken cancellationToken
                     fileSystem,
                     logger,
                     cancellationToken,
-                    limitEditorConfigSearch: true
+                    limitConfigSearch: true
                 );
 
                 if (

diff --git a/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs b/Src/CSharpier.Cli/Options/ConfigurationFileOptions.cs
@@ -46,14 +46,20 @@ ConfigurationFileOptions configurationFileOptions
     internal static List<CSharpierConfigData> FindForDirectoryName(
         string directoryName,
         IFileSystem fileSystem,
-        ILogger logger
+        ILogger logger,
+        bool limitEditorConfigSearch
     )
     {
         var results = new List<CSharpierConfigData>();
         var directoryInfo = fileSystem.DirectoryInfo.New(directoryName);
 
         var filesByDirectory = directoryInfo
-            .EnumerateFiles(".csharpierrc*", SearchOption.AllDirectories)
+            .EnumerateFiles(
+                ".csharpierrc*",
+                limitEditorConfigSearch
+                    ? SearchOption.TopDirectoryOnly
+                    : SearchOption.AllDirectories
+            )
             .GroupBy(o => o.DirectoryName);
 
         foreach (var group in filesByDirectory)

diff --git a/Src/CSharpier.Cli/Options/OptionsProvider.cs b/Src/CSharpier.Cli/Options/OptionsProvider.cs
@@ -36,15 +36,20 @@ public static async Task<OptionsProvider> Create(
         IFileSystem fileSystem,
         ILogger logger,
         CancellationToken cancellationToken,
-        bool limitEditorConfigSearch = false
+        bool limitConfigSearch = false
     )
     {
         var specifiedPrinterOptions = configPath is not null
             ? ConfigurationFileOptions.CreatePrinterOptionsFromPath(configPath, fileSystem, logger)
             : null;
 
         var csharpierConfigs = configPath is null
-            ? ConfigurationFileOptions.FindForDirectoryName(directoryName, fileSystem, logger)
+            ? ConfigurationFileOptions.FindForDirectoryName(
+                directoryName,
+                fileSystem,
+                logger,
+                limitConfigSearch
+            )
             : Array.Empty<CSharpierConfigData>().ToList();
 
         IList<EditorConfigSections>? editorConfigSections = null;
@@ -56,7 +61,7 @@ public static async Task<OptionsProvider> Create(
             editorConfigSections = EditorConfigParser.FindForDirectoryName(
                 directoryName,
                 fileSystem,
-                limitEditorConfigSearch,
+                limitConfigSearch,
                 ignoreFile
             );
         }

diff --git a/Src/CSharpier.Tests/OptionsProviderTests.cs b/Src/CSharpier.Tests/OptionsProviderTests.cs
@@ -647,6 +647,28 @@ public async Task Should_Not_Look_For_Subfolders_EditorConfig_When_Limited()
         result.TabWidth.Should().Be(4);
     }
 
+    [Test]
+    public async Task Should_Not_Look_For_Subfolders_CSharpierRc_When_Limited()
+    {
+        var context = new TestContext();
+        context.WhenAFileExists(
+            "c:/test/subfolder/.csharpierrc",
+            @"
+    [*]
+    tabWidth: 1
+    "
+        );
+
+        // this shouldn't happen in the real world, but validates we correctly limit
+        // the search to the top directory only
+        var result = await context.CreateProviderAndGetOptionsFor(
+            "c:/test/",
+            "c:/test/subfolder/test.cs",
+            limitEditorConfigSearch: true
+        );
+        result.TabWidth.Should().Be(4);
+    }
+
     [Test]
     public async Task Should_Look_For_Subfolders_When_Limited()
     {