Roslynator fixes.

Author: electricessence

Open.ChannelExtensions.Tests/AssumptionTests.cs

@@ -38,6 +38,5 @@ public static async Task WaitCancellation()
 			var result = await Task.WhenAny(t1.AsTask(), t2.AsTask()).ConfigureAwait(false);
 			Assert.True(result.IsCanceled);
 		}
-
 	}
 }

Open.ChannelExtensions.Tests/BatchTests.cs

@@ -54,7 +54,6 @@ await c.Reader
 				}
 				await Task.Delay(500);
 			});
-
 	}
 
 	[Fact]
@@ -104,10 +103,8 @@ await c.Reader
 				}
 				await Task.Delay(500);
 			});
-
 	}
 
-
 	[Fact]
 	public static async Task ForceBatchTest()
 	{
@@ -146,7 +143,6 @@ public static async Task ForceBatchTest()
 				}
 				await Task.Delay(500);
 			}));
-
 	}
 
 	[Fact]
@@ -229,7 +225,6 @@ public static async Task TimeoutTest0()
 		}));
 	}
 
-
 	[Fact]
 	public static async Task TimeoutTest1()
 	{
@@ -272,14 +267,13 @@ public static async Task TimeoutTest1()
 		}));
 	}
 
-
 	#if NET5_0_OR_GREATER
 	[Fact]
 	public static async Task BatchReadBehavior()
 	{
 		var c = Channel.CreateBounded<int>(new BoundedChannelOptions(20) { SingleReader = false, SingleWriter = false });
 		BatchingChannelReader<int> reader = c.Reader.Batch(10);
-		
+
 		var queue = new Queue<int>(Enumerable.Range(0, 100));
 		int e;
 		while(queue.TryDequeue(out e) && c.Writer.TryWrite(e))
@@ -423,4 +417,3 @@ public static async IAsyncEnumerable<IList<T>> ReadBatchEnumerableAsyncBakedIn<T
 	}
 #endif
 }
-

Open.ChannelExtensions.Tests/CancellationTests.cs

@@ -8,7 +8,6 @@ namespace Open.ChannelExtensions.Tests;
 
 public static class CancellationTests
 {
-
 	[Fact]
 	public static async Task OperationCancellationPropagation()
 	{
@@ -71,7 +70,6 @@ await range
 		Assert.NotEqual(testSize, total);
 	}
 
-
 	[Fact]
 	public static async Task CancellationPropagationConcurrent()
 	{
@@ -102,7 +100,5 @@ await range
 
 		Assert.Equal(1, count);
 		Assert.NotEqual(testSize, total);
-
 	}
-
-}
+}

Open.ChannelExtensions.Tests/ExceptionTests.cs

@@ -8,7 +8,7 @@ namespace Open.ChannelExtensions.Tests;
 
 public static class ExceptionTests
 {
-
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1194:Implement exception constructors.")]
 	class TestException : Exception { }
 
 	[Fact]
@@ -48,7 +48,6 @@ await Assert.ThrowsAsync<AggregateException>(async () =>
 		{
 			try
 			{
-
 				await range
 					.ToChannel()
 					.ReadAllConcurrently(8, i =>
@@ -60,7 +59,6 @@ await range
 							throw new TestException();
 						}
 					});
-
 			}
 			catch (Exception ex)
 			{

Open.ChannelExtensions.Tests/SpecialTests.cs

@@ -1,25 +1,15 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Open.ChannelExtensions.Tests;
 
 public class SpecialTests
 {
-	private readonly ITestOutputHelper output;
-
-	public SpecialTests(ITestOutputHelper outputHelper)
-	{
-		output = outputHelper;
-	}
-
 	[Fact]
 	public void PossibleSourceLoadingIssue()
 	{
@@ -47,7 +37,7 @@ Task StartProcessingTask2(IEnumerable<int> source)
 				.ReadAll(IncrementCount2)
 				.AsTask();
 
-		void IncrementCount2(int c)
+		void IncrementCount2(int _)
 			=> Interlocked.Increment(ref count_);
 	}
 }

Open.ChannelExtensions/BatchingChannelReader.cs

@@ -59,7 +59,7 @@ public BatchingChannelReader<T> WithTimeout(long millisecondsTimeout)
 	{
 		_timeout = millisecondsTimeout <= 0 ? Timeout.Infinite : millisecondsTimeout;
 
-		if (Buffer is null || Buffer.Reader.Completion.IsCompleted)
+		if (Buffer?.Reader.Completion.IsCompleted != false)
 			return this;
 
 		if (_timeout == Timeout.Infinite)
@@ -72,7 +72,7 @@ public BatchingChannelReader<T> WithTimeout(long millisecondsTimeout)
 			() => new Timer(ForceBatch));
 
 		if (_batch is null) return this;
-		
+
 		// Might be in the middle of a batch so we need to update the timeout.
 		lock(Buffer)
 		{
@@ -108,7 +108,7 @@ protected override void OnBeforeFinalFlush()
 	/// <inheritdoc />
 	protected override bool TryPipeItems(bool flush)
 	{
-		if (Buffer is null || Buffer.Reader.Completion.IsCompleted)
+		if (Buffer?.Reader.Completion.IsCompleted != false)
 			return false;
 
 		lock (Buffer)
@@ -119,7 +119,7 @@ protected override bool TryPipeItems(bool flush)
 			var newBatch = false;
 			List<T>? c = _batch;
 			ChannelReader<T>? source = Source;
-			if (source is null || source.Completion.IsCompleted)
+			if (source?.Completion.IsCompleted != false)
 			{
 				// All finished, if necessary, release the last batch to the buffer.
 				if (c is null) return false;
@@ -128,12 +128,15 @@ protected override bool TryPipeItems(bool flush)
 
 			while (source.TryRead(out T? item))
 			{
-				if (c is not null) c.Add(item);
-				else
+				if (c is null)
 				{
 					newBatch = true; // a new batch could start but not be emmited.
 					_batch = c = new List<T>(_batchSize) { item };
 				}
+				else
+				{
+					c.Add(item);
+				}
 
 				Debug.Assert(c.Count <= _batchSize);
 				var full = c.Count == _batchSize;

Open.ChannelExtensions/BufferingChannelReader.cs

@@ -23,7 +23,6 @@ public abstract class BufferingChannelReader<TIn, TOut> : ChannelReader<TOut>
 	/// </summary>
 	protected Channel<TOut>? Buffer { get; }
 
-
 	/// <summary>
 	/// Base constructor for a BufferingChannelReader.
 	/// </summary>
@@ -100,7 +99,7 @@ public override bool TryRead(out TOut item)
 	/// <inheritdoc />
 	public override ValueTask<bool> WaitToReadAsync(CancellationToken cancellationToken = default)
 	{
-		if (Buffer is null || Buffer.Reader.Completion.IsCompleted)
+		if (Buffer?.Reader.Completion.IsCompleted != false)
 			return new ValueTask<bool>(false);
 
 		if (cancellationToken.IsCancellationRequested)
@@ -117,7 +116,7 @@ public override ValueTask<bool> WaitToReadAsync(CancellationToken cancellationTo
 	protected virtual async ValueTask<bool> WaitToReadAsyncCore(ValueTask<bool> bufferWait, CancellationToken cancellationToken)
 	{
 		ChannelReader<TIn>? source = Source;
-		if (source is null || bufferWait.IsCompleted) 
+		if (source is null || bufferWait.IsCompleted)
 			return await bufferWait.ConfigureAwait(false);
 
 		using var tokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);