Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions .github/workflows/unskip-closed-tests-tool/ApplyEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ internal static partial class ApplyEngine
private sealed record SourceEdit(string Path, int Start, int Length, Candidate Candidate);
private sealed record VerificationOutcome(bool Success, string Reason);

private static Dictionary<string, Candidate> ToCandidateMap(IEnumerable<Candidate> candidates) =>
candidates.ToDictionary(static candidate => candidate.CandidateId, StringComparer.Ordinal);

private static Dictionary<string, byte[]> CloneBytesMap(Dictionary<string, byte[]> source) =>
source.ToDictionary(
static pair => pair.Key,
static pair => pair.Value.ToArray(),
StringComparer.Ordinal);

public static async Task<ApplyResult> ApplyAsync(
string requestedRoot,
ToolConfig config,
Expand All @@ -19,8 +28,7 @@ public static async Task<ApplyResult> ApplyAsync(
}

List<string> selectedIds = ReadAgentSelection(agentOutputPath, requestedManifest.ManifestDigest);
Dictionary<string, Candidate> requestedCandidates = requestedManifest.Candidates
.ToDictionary(static candidate => candidate.CandidateId, StringComparer.Ordinal);
Dictionary<string, Candidate> requestedCandidates = ToCandidateMap(requestedManifest.Candidates);
foreach (string candidateId in selectedIds)
{
if (!requestedCandidates.TryGetValue(candidateId, out Candidate? candidate))
Expand Down Expand Up @@ -54,8 +62,7 @@ public static async Task<ApplyResult> ApplyAsync(
return EmptyResult(requestedManifest.SourceCommit, requestedManifest.ManifestDigest);
}

Dictionary<string, Candidate> candidates = freshResolved.Candidates
.ToDictionary(static candidate => candidate.CandidateId, StringComparer.Ordinal);
Dictionary<string, Candidate> candidates = ToCandidateMap(freshResolved.Candidates);
List<SourceEdit> edits = selectedIds
.Select(candidateId => CreateEdit(repository, config, candidates[candidateId]))
.OrderBy(static edit => edit.Path, StringComparer.Ordinal)
Expand All @@ -70,10 +77,7 @@ public static async Task<ApplyResult> ApplyAsync(
static path => path,
path => ReadBytes(PathRules.ResolveInsideRoot(repository.Root, path, "candidate path")),
StringComparer.Ordinal);
Dictionary<string, byte[]> expectedBytes = originalBytes.ToDictionary(
static pair => pair.Key,
static pair => pair.Value.ToArray(),
StringComparer.Ordinal);
Dictionary<string, byte[]> expectedBytes = CloneBytesMap(originalBytes);
List<string> retained = [];
List<RevertedCandidateResult> reverted = [];

Expand Down Expand Up @@ -167,10 +171,7 @@ public static async Task<ApplyResult> ApplyAsync(
if (retained.Count > 0)
{
HashSet<string> retainedSet = retained.ToHashSet(StringComparer.Ordinal);
Dictionary<string, byte[]> rebuiltBytes = originalBytes.ToDictionary(
static pair => pair.Key,
static pair => pair.Value.ToArray(),
StringComparer.Ordinal);
Dictionary<string, byte[]> rebuiltBytes = CloneBytesMap(originalBytes);
foreach (SourceEdit edit in edits.Where(edit => retainedSet.Contains(edit.Candidate.CandidateId)))
{
rebuiltBytes[edit.Path] = ApplyTextEdit(
Expand All @@ -196,8 +197,7 @@ public static async Task<ApplyResult> ApplyAsync(
};
}

Dictionary<string, Candidate> finalCandidates = finalEligibility.Candidates
.ToDictionary(static candidate => candidate.CandidateId, StringComparer.Ordinal);
Dictionary<string, Candidate> finalCandidates = ToCandidateMap(finalEligibility.Candidates);
List<Candidate> retainedCandidates = retained.Select(id => finalCandidates[id])
.OrderBy(static candidate => candidate.Path, StringComparer.Ordinal)
.ThenBy(static candidate => candidate.AttributeSpan.Start)
Expand Down
Loading