missing WaitAsync cancellationToken (#227)

SimonCropp · Sep 26, 2024 · 98f1554 · 98f1554
1 parent 97565a8
commit 98f1554
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 25 deletions.
diff --git a/contributing.md b/contributing.md
@@ -225,7 +225,8 @@ static partial class Polyfill
             return Task.FromCanceled(cancellationToken);
         }
 
-        return target.FlushAsync();
+        return target.FlushAsync()
+            .WaitAsync(cancellationToken);
     }
 
 #endif
@@ -283,7 +284,8 @@ static partial class Polyfill
                 await target.WriteAsync(chunk, cancel).ConfigureAwait(false);
             }
 #else
-            await target.WriteAsync(builder.ToString());
+            await target.WriteAsync(builder.ToString())
+                .WaitAsync(cancellationToken);
 #endif
         }
     }
@@ -315,7 +317,9 @@ static partial class Polyfill
             segment = new(buffer.ToArray());
         }
 
-        return new(target.WriteAsync(segment.Array!, segment.Offset, segment.Count));
+        var task = target.WriteAsync(segment.Array!, segment.Offset, segment.Count)
+            .WaitAsync(cancellationToken);
+        return new(task);
     }
 
     /// <summary>
@@ -341,7 +345,9 @@ static partial class Polyfill
             segment = new(buffer.ToArray());
         }
 
-        return new(target.WriteLineAsync(segment.Array!, segment.Offset, segment.Count));
+        var task = target.WriteLineAsync(segment.Array!, segment.Offset, segment.Count)
+            .WaitAsync(cancellationToken);
+        return new(task);
     }
 
 #endif
@@ -394,7 +400,7 @@ static partial class Polyfill
 #endif
 }
 ```
-<sup><a href='/src/Polyfill/Polyfill_TextWriter.cs#L1-L207' title='Snippet source file'>snippet source</a> | <a href='#snippet-Polyfill_TextWriter.cs' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Polyfill/Polyfill_TextWriter.cs#L1-L213' title='Snippet source file'>snippet source</a> | <a href='#snippet-Polyfill_TextWriter.cs' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -429,9 +435,18 @@ partial class PolyfillTests
         var read = await reader.ReadToEndAsync(Cancel.None);
         Assert.AreEqual("value", read);
     }
+
+    [Test]
+    public async Task StreamReaderReadLineAsync()
+    {
+        using var stream = new MemoryStream("line1\nline2"u8.ToArray());
+        using var reader = new StreamReader(stream);
+        var read = await reader.ReadLineAsync(CancellationToken.None);
+        Assert.AreEqual("line1", read);
+    }
 }
 ```
-<sup><a href='/src/Tests/PolyfillTests_StreamReader.cs#L1-L23' title='Snippet source file'>snippet source</a> | <a href='#snippet-PolyfillTests_StreamReader.cs' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/PolyfillTests_StreamReader.cs#L1-L32' title='Snippet source file'>snippet source</a> | <a href='#snippet-PolyfillTests_StreamReader.cs' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>6.9.0</Version>
+    <Version>6.10.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Polyfill</PackageTags>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>

diff --git a/src/Polyfill/Polyfill_HttpClient.cs b/src/Polyfill/Polyfill_HttpClient.cs
@@ -89,12 +89,14 @@ public static async Task<byte[]> GetByteArrayAsync(
             using var response = await target.GetAsync(
                 requestUri,
                 HttpCompletionOption.ResponseHeadersRead,
-                cancellationToken
-            ).ConfigureAwait(false);
+                cancellationToken)
+                .ConfigureAwait(false);
 
             response.EnsureSuccessStatusCode();
 
-            return await response.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false);
+            return await response.Content
+                .ReadAsByteArrayAsync(cancellationToken)
+                .ConfigureAwait(false);
         }
         // Older versions of HttpClient methods don't propagate the cancellation token inside the exception
         catch (OperationCanceledException exception) when (
@@ -143,12 +145,14 @@ public static async Task<string> GetStringAsync(
             using var response = await target.GetAsync(
                 requestUri,
                 HttpCompletionOption.ResponseHeadersRead,
-                cancellationToken
-            ).ConfigureAwait(false);
+                cancellationToken)
+                .ConfigureAwait(false);
 
             response.EnsureSuccessStatusCode();
 
-            return await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            return await response.Content
+                .ReadAsStringAsync(cancellationToken)
+                .ConfigureAwait(false);
         }
         // Older versions of HttpClient methods don't propagate the cancellation token inside the exception
         catch (OperationCanceledException exception) when (

diff --git a/src/Polyfill/Polyfill_HttpContent.cs b/src/Polyfill/Polyfill_HttpContent.cs
@@ -29,7 +29,8 @@ public static Task<Stream> ReadAsStreamAsync(
         CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
-        return target.ReadAsStreamAsync();
+        return target.ReadAsStreamAsync()
+            .WaitAsync(cancellationToken);
     }
 
     /// <summary>
@@ -49,7 +50,8 @@ public static Task<byte[]> ReadAsByteArrayAsync(
         CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
-        return target.ReadAsByteArrayAsync();
+        return target.ReadAsByteArrayAsync()
+            .WaitAsync(cancellationToken);
     }
 
     /// <summary>
@@ -69,7 +71,8 @@ public static Task<string> ReadAsStringAsync(
         CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
-        return target.ReadAsStringAsync();
+        return target.ReadAsStringAsync()
+            .WaitAsync(cancellationToken);
     }
 }
 #endif
diff --git a/src/Polyfill/Polyfill_Stream.cs b/src/Polyfill/Polyfill_Stream.cs
@@ -40,7 +40,8 @@ public static ValueTask<int> ReadAsync(
             segment = new(buffer.ToArray());
         }
 
-        return new(target.ReadAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken));
+        var task = target.ReadAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken);
+        return new(task);
     }
 
     /// <summary>
@@ -63,7 +64,8 @@ public static ValueTask WriteAsync(
             segment = new(buffer.ToArray());
         }
 
-        return new(target.WriteAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken));
+        var task = target.WriteAsync(segment.Array!, segment.Offset, segment.Count, cancellationToken);
+        return new(task);
     }
 
 #endif

diff --git a/src/Polyfill/Polyfill_TextReader.cs b/src/Polyfill/Polyfill_TextReader.cs
@@ -41,7 +41,9 @@ public static ValueTask<int> ReadAsync(
             segment = new(buffer.ToArray());
         }
 
-        return new(target.ReadAsync(segment.Array!, segment.Offset, segment.Count));
+        var task = target.ReadAsync(segment.Array!, segment.Offset, segment.Count)
+            .WaitAsync(cancellationToken);
+        return new(task);
     }
 #endif
 
@@ -62,7 +64,8 @@ public static Task<string> ReadToEndAsync(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        return target.ReadToEndAsync();
+        return target.ReadToEndAsync()
+            .WaitAsync(cancellationToken);
     }
 
     /// <summary>
@@ -81,7 +84,8 @@ public static Task<string> ReadLineAsync(
     {
         cancellationToken.ThrowIfCancellationRequested();
 
-        return target.ReadLineAsync();
+        return target.ReadLineAsync()
+            .WaitAsync(cancellationToken);
     }
 #endif
 }
diff --git a/src/Polyfill/Polyfill_TextWriter.cs b/src/Polyfill/Polyfill_TextWriter.cs
@@ -37,7 +37,8 @@ public static Task FlushAsync(this TextWriter target, CancellationToken cancella
             return Task.FromCanceled(cancellationToken);
         }
 
-        return target.FlushAsync();
+        return target.FlushAsync()
+            .WaitAsync(cancellationToken);
     }
 
 #endif
@@ -95,7 +96,8 @@ async Task WriteAsyncCore(StringBuilder builder, CancellationToken cancel)
                 await target.WriteAsync(chunk, cancel).ConfigureAwait(false);
             }
 #else
-            await target.WriteAsync(builder.ToString());
+            await target.WriteAsync(builder.ToString())
+                .WaitAsync(cancellationToken);
 #endif
         }
     }
@@ -127,7 +129,9 @@ public static ValueTask WriteAsync(
             segment = new(buffer.ToArray());
         }
 
-        return new(target.WriteAsync(segment.Array!, segment.Offset, segment.Count));
+        var task = target.WriteAsync(segment.Array!, segment.Offset, segment.Count)
+            .WaitAsync(cancellationToken);
+        return new(task);
     }
 
     /// <summary>
@@ -153,7 +157,9 @@ public static ValueTask WriteLineAsync(
             segment = new(buffer.ToArray());
         }
 
-        return new(target.WriteLineAsync(segment.Array!, segment.Offset, segment.Count));
+        var task = target.WriteLineAsync(segment.Array!, segment.Offset, segment.Count)
+            .WaitAsync(cancellationToken);
+        return new(task);
     }
 
 #endif

diff --git a/src/Tests/PolyfillTests_StreamReader.cs b/src/Tests/PolyfillTests_StreamReader.cs
@@ -20,4 +20,13 @@ public async Task StreamReaderReadToEndAsync()
         var read = await reader.ReadToEndAsync(Cancel.None);
         Assert.AreEqual("value", read);
     }
+
+    [Test]
+    public async Task StreamReaderReadLineAsync()
+    {
+        using var stream = new MemoryStream("line1\nline2"u8.ToArray());
+        using var reader = new StreamReader(stream);
+        var read = await reader.ReadLineAsync(CancellationToken.None);
+        Assert.AreEqual("line1", read);
+    }
 }