Gracefully deal with bad editorconfigs (#1229)

closes #1227
belav · Apr 16, 2024 · 2d5c87f · 2d5c87f
1 parent ea02607
commit 2d5c87f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs b/Src/CSharpier.Cli/EditorConfig/ConfigFileParser.cs
@@ -18,27 +18,33 @@ internal static class ConfigFileParser
             CommentRegex = CommentRegex,
             AllowDuplicateKeys = true,
             AllowDuplicateSections = true,
-            OverrideDuplicateKeys = true
+            OverrideDuplicateKeys = true,
+            SkipInvalidLines = true,
+            ThrowExceptionsOnError = false
         };
 
     public static ConfigFile Parse(string filePath, IFileSystem fileSystem)
     {
+        var directory = fileSystem.Path.GetDirectoryName(filePath);
+
+        ArgumentNullException.ThrowIfNull(directory);
+
         var parser = new FileIniDataParser(new IniDataParser(Configuration));
 
         using var stream = fileSystem.File.OpenRead(filePath);
         using var streamReader = new StreamReader(stream);
         var configData = parser.ReadData(streamReader);
 
-        var directory = fileSystem.Path.GetDirectoryName(filePath);
-
-        ArgumentNullException.ThrowIfNull(directory);
-
         var sections = new List<Section>();
-        foreach (var section in configData.Sections)
+        if (configData is not null)
         {
-            sections.Add(new Section(section, directory));
+            sections.AddRange(configData.Sections.Select(s => new Section(s, directory)));
         }
 
-        return new ConfigFile { IsRoot = configData.Global["root"] == "true", Sections = sections };
+        return new ConfigFile
+        {
+            IsRoot = configData?.Global["root"] == "true",
+            Sections = sections
+        };
     }
 }
diff --git a/Src/CSharpier.Tests/OptionsProviderTests.cs b/Src/CSharpier.Tests/OptionsProviderTests.cs
@@ -559,7 +559,7 @@ public async Task Should_Not_Prefer_Closer_EditorConfig()
     }
 
     [Test]
-    public async Task Should_Ignore_Invalid_EditorConfig()
+    public async Task Should_Ignore_Invalid_EditorConfig_Lines()
     {
         var context = new TestContext();
         context.WhenAFileExists(
@@ -573,7 +573,7 @@ public async Task Should_Ignore_Invalid_EditorConfig()
 
         var result = await context.CreateProviderAndGetOptionsFor("c:/test", "c:/test/test.cs");
 
-        result.TabWidth.Should().Be(4);
+        result.TabWidth.Should().Be(2);
     }
 
     [Test]