Fix redirected input (#1274)

dotnet · Nov 23, 2023 · 954e773 · 954e773
1 parent 72e07fa
commit 954e773
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -26,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix analyzer [RCS1196](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1196) ([PR](https://github.com/dotnet/roslynator/pull/1235))
 - Fix analyzer [RCS1257](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1257) ([PR](https://github.com/dotnet/roslynator/pull/1264))
 - Fix analyzer [RCS1259](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1259) ([PR](https://github.com/dotnet/roslynator/pull/1268))
-- [CLI] Fix reading of non-existent redirected input on git bash ([PR](https://github.com/dotnet/roslynator/pull/1265))
+- [CLI] Fix reading of non-existent redirected input on git bash ([PR](https://github.com/dotnet/roslynator/pull/1265), [PR](https://github.com/dotnet/roslynator/pull/1274))
 - [CLI] Fix exit code for `roslynator --version` ([PR](https://github.com/dotnet/roslynator/pull/1273))
 
 ## [4.6.2] - 2023-11-10

diff --git a/src/CommandLine/ConsoleHelpers.cs b/src/CommandLine/ConsoleHelpers.cs
@@ -9,7 +9,7 @@ namespace Roslynator.CommandLine;
 
 internal static class ConsoleHelpers
 {
-    public static async Task<ImmutableArray<string>> ReadRedirectedInputAsLines()
+    public static ImmutableArray<string> ReadRedirectedInputAsLines()
     {
         if (Console.IsInputRedirected)
         {
@@ -18,9 +18,18 @@ public static async Task<ImmutableArray<string>> ReadRedirectedInputAsLines()
             using (Stream stream = Console.OpenStandardInput())
             using (var streamReader = new StreamReader(stream, Console.InputEncoding))
             {
+                Task<string> readLineTask = streamReader.ReadLineAsync();
+
+                // https://github.com/dotnet/runtime/issues/95079
+                if (!readLineTask.Wait(TimeSpan.FromMilliseconds(500)))
+                    return default;
+
+                if (readLineTask.Result is null)
+                    return ImmutableArray<string>.Empty;
+
                 string line;
 
-                while ((line = await streamReader.ReadLineAsync()) is not null)
+                while ((line = streamReader.ReadLine()) is not null)
                     lines.Add(line);
             }
 

diff --git a/src/CommandLine/Program.cs b/src/CommandLine/Program.cs
@@ -842,14 +842,17 @@ private static bool TryParsePaths(IEnumerable<string> values, out ImmutableArray
 
         if (Console.IsInputRedirected)
         {
-            Task<ImmutableArray<string>> task = ConsoleHelpers.ReadRedirectedInputAsLines();
-
             WriteLine("Reading redirected input...", Verbosity.Diagnostic);
 
-            // https://github.com/dotnet/runtime/issues/95079
-            if (task.Wait(TimeSpan.FromMilliseconds(500)))
+            ImmutableArray<string> lines = ConsoleHelpers.ReadRedirectedInputAsLines();
+
+            if (lines.IsDefault)
+            {
+                WriteLine("Unable to read redirected input", Verbosity.Diagnostic);
+            }
+            else
             {
-                IEnumerable<string> paths1 = task.Result.Where(f => !string.IsNullOrEmpty(f));
+                IEnumerable<string> paths1 = lines.Where(f => !string.IsNullOrEmpty(f));
 
                 WriteLine("Successfully read redirected input:" + Environment.NewLine + "  " + string.Join(Environment.NewLine + "  ", paths1), Verbosity.Diagnostic);
 
@@ -858,10 +861,6 @@ private static bool TryParsePaths(IEnumerable<string> values, out ImmutableArray
 
                 paths = paths.AddRange(ImmutableArray.CreateRange(paths2, f => new PathInfo(f, PathOrigin.PipedInput)));
             }
-            else
-            {
-                WriteLine("Unable to read redirected input", Verbosity.Diagnostic);
-            }
         }
 
         if (!paths.IsEmpty)