Fixing bug with no longer finding config files for piped in files

closes #1028
belav · Nov 22, 2023 · 89adac4 · 89adac4
1 parent d2e6431
commit 89adac4
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/Src/CSharpier.Cli.Tests/CliTests.cs b/Src/CSharpier.Cli.Tests/CliTests.cs
@@ -152,6 +152,42 @@ public async Task Should_Format_Piped_File(string lineEnding)
         result.ExitCode.Should().Be(0);
     }
 
+    [Test]
+    public async Task Should_Format_Piped_File_With_Config()
+    {
+        await this.WriteFileAsync(".csharpierrc", "printWidth: 10");
+
+        var formattedContent1 = "var x =\n    _________________longName;\n";
+        var unformattedContent1 = "var x = _________________longName;\n";
+
+        var result = await new CsharpierProcess()
+            .WithPipedInput(unformattedContent1)
+            .ExecuteAsync();
+
+        result.Output.Should().Be(formattedContent1);
+        result.ExitCode.Should().Be(0);
+    }
+
+    [Test]
+    public async Task Should_Format_Piped_File_With_EditorConfig()
+    {
+        await this.WriteFileAsync(
+            ".editorconfig",
+            @"[*]
+max_line_length = 10"
+        );
+
+        var formattedContent1 = "var x =\n    _________________longName;\n";
+        var unformattedContent1 = "var x = _________________longName;\n";
+
+        var result = await new CsharpierProcess()
+            .WithPipedInput(unformattedContent1)
+            .ExecuteAsync();
+
+        result.Output.Should().Be(formattedContent1);
+        result.ExitCode.Should().Be(0);
+    }
+
     [Test]
     public async Task Should_Format_Unicode()
     {

diff --git a/Src/CSharpier.Cli/CommandLineFormatter.cs b/Src/CSharpier.Cli/CommandLineFormatter.cs
@@ -24,15 +24,20 @@ CancellationToken cancellationToken
 
             if (commandLineOptions.StandardInFileContents != null)
             {
-                var filePath = commandLineOptions.DirectoryOrFilePaths[0];
+                // currently when piping stdin, this will always be a directory
+                var directoryPath = commandLineOptions.DirectoryOrFilePaths[0];
+                // but we need a filename to correctly find config files
+                // #288 should be done once we support csproj/xml, and possibly be required
+                var filePath = Path.Combine(directoryPath, "StdIn.cs");
+
                 var fileToFormatInfo = FileToFormatInfo.Create(
                     filePath,
                     commandLineOptions.StandardInFileContents,
                     console.InputEncoding
                 );
 
                 var optionsProvider = await OptionsProvider.Create(
-                    fileSystem.Path.GetDirectoryName(filePath),
+                    directoryPath,
                     commandLineOptions.ConfigPath,
                     fileSystem,
                     logger,