Skip to content

fix some closures #1712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonCropp merged 1 commit into from
Apr 9, 2026
+5 −5
Merged

fix some closures #1712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Verify/Compare/FileComparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static async Task<EqualityResult> DoCompare(VerifySettings settings, File
if (!previousTextFailed &&
settings.TryFindStreamComparer(file.Extension, out var compare))
{
return await InnerCompare(file, receivedStream, (s1, s2) => compare(s1, s2, settings.Context));
return await InnerCompare(file, receivedStream, compare, settings.Context);
}

if (receivedStream.CanSeekAndReadLength() &&
Expand All @@ -27,10 +27,10 @@ public static async Task<EqualityResult> DoCompare(VerifySettings settings, File
return new(Equality.NotEqual, null, null, null);
}

return await InnerCompare(file, receivedStream, StreamComparer.AreEqual);
return await InnerCompare(file, receivedStream, static (s1, s2, _) => StreamComparer.AreEqual(s1, s2), null!);
}

static async Task<EqualityResult> InnerCompare(FilePair file, Stream receivedStream, Func<Stream, Stream, Task<CompareResult>> func)
static async Task<EqualityResult> InnerCompare(FilePair file, Stream receivedStream, StreamCompare compare, IReadOnlyDictionary<string, object> context)
{
#if NETFRAMEWORK
using var verifiedStream = IoHelpers.OpenRead(file.VerifiedPath);
Expand All @@ -41,7 +41,7 @@ static async Task<EqualityResult> InnerCompare(FilePair file, Stream receivedStr
if (receivedStream is FileStream fileStream)
{
fileStream.ThrowIfEmpty();
var compareResult = await func(fileStream, verifiedStream);
var compareResult = await compare(fileStream, verifiedStream, context);
if (compareResult.IsEqual)
{
return new(Equality.Equal, compareResult.Message, null, null);
Expand All @@ -53,7 +53,7 @@ static async Task<EqualityResult> InnerCompare(FilePair file, Stream receivedStr

async Task<EqualityResult> EqualityResult(Stream receivedStream, Stream verifiedStream)
{
var compareResult = await func(receivedStream, verifiedStream);
var compareResult = await compare(receivedStream, verifiedStream, context);

if (compareResult.IsEqual)
{
Expand Down
Loading