Skip to content

Commit 019b96e

Browse files
committed
Update InnerVerifier_Inner.cs
1 parent ab929bf commit 019b96e

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/Verify/Verifier/InnerVerifier_Inner.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@ Task<VerifyResult> VerifyInner(IEnumerable<Target> targets) =>
88
async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumerable<Target> targets, bool doExtensionConversion, bool ignoreNullRoot)
99
{
1010
cleanup ??= () => Task.CompletedTask;
11-
var resultTargets = new List<Target>();
12-
if (TryGetRootTarget(root, ignoreNullRoot, out var rootTarget))
13-
{
14-
resultTargets.Add(rootTarget.Value);
15-
}
16-
17-
var (extraTargets, extraCleanup) = await GetTargets(targets, doExtensionConversion);
11+
var (resultTargets, extraCleanup) = await GetTargets(root, targets, doExtensionConversion, ignoreNullRoot);
1812
cleanup += extraCleanup;
19-
resultTargets.AddRange(extraTargets);
2013
var engine = new VerifyEngine(
2114
directory,
2215
settings,
@@ -41,6 +34,19 @@ async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumera
4134
return new(filePairs, root);
4235
}
4336

37+
async Task<(List<Target> resultTargets, Func<Task> extraCleanup)> GetTargets(object? root, IEnumerable<Target> targets, bool doExtensionConversion, bool ignoreNullRoot)
38+
{
39+
var resultTargets = new List<Target>();
40+
if (TryGetRootTarget(root, ignoreNullRoot, out var rootTarget))
41+
{
42+
resultTargets.Add(rootTarget.Value);
43+
}
44+
45+
var (extraTargets, extraCleanup) = await GetTargets(targets, doExtensionConversion);
46+
resultTargets.AddRange(extraTargets);
47+
return (resultTargets, extraCleanup);
48+
}
49+
4450
async Task<(List<Target> extra, Func<Task> cleanup)> GetTargets(IEnumerable<Target> targets, bool doExtensionConversion)
4551
{
4652
List<Target> list = [..targets, ..VerifierSettings.GetFileAppenders(settings)];

0 commit comments

Comments
 (0)