Skip to content

Fix OOP crash issue with copilot change analysis #78931

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.

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
merged 3 commits into from
Jun 12, 2025
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@ internal readonly record struct CopilotCodeFixAnalysis(
[property: DataMember(Order = 3)] Dictionary<string, TimeSpan> DiagnosticIdToApplicationTime,
[property: DataMember(Order = 4)] Dictionary<string, HashSet<string>> DiagnosticIdToProviderName,
[property: DataMember(Order = 5)] Dictionary<string, TimeSpan> ProviderNameToApplicationTime,
[property: DataMember(Order = 6)] Dictionary<string, bool> ProviderNameToHasConflict);
[property: DataMember(Order = 6)] Dictionary<string, bool> ProviderNameToHasConflict,
[property: DataMember(Order = 7)] Dictionary<string, int> ProviderNameToTotalCount,
[property: DataMember(Order = 8)] Dictionary<string, int> ProviderNameToSuccessCount);
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ public static IDisposable LogCopilotChangeAnalysis(
d["CodeFixAnalysis_DiagnosticIdToProviderName"] = StringifyDictionary(analysisResult.CodeFixAnalysis.DiagnosticIdToProviderName);
d["CodeFixAnalysis_ProviderNameToApplicationTime"] = StringifyDictionary(analysisResult.CodeFixAnalysis.ProviderNameToApplicationTime);
d["CodeFixAnalysis_ProviderNameToHasConflict"] = StringifyDictionary(analysisResult.CodeFixAnalysis.ProviderNameToHasConflict);
d["CodeFixAnalysis_ProviderNameToTotalCount"] = StringifyDictionary(analysisResult.CodeFixAnalysis.ProviderNameToTotalCount);
d["CodeFixAnalysis_ProviderNameToSuccessCount"] = StringifyDictionary(analysisResult.CodeFixAnalysis.ProviderNameToSuccessCount);
}, args: (featureId, accepted, proposalId, analysisResult)),
cancellationToken);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Microsoft.CodeAnalysis.CodeActions;
using Microsoft.CodeAnalysis.CodeFixes;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.ErrorReporting;
using Microsoft.CodeAnalysis.Host;
using Microsoft.CodeAnalysis.Host.Mef;
using Microsoft.CodeAnalysis.PooledObjects;
Expand Down Expand Up @@ -255,30 +256,44 @@ private async Task<CopilotCodeFixAnalysis> ComputeCodeFixAnalysisAsync(
var diagnosticIdToProviderName = new Dictionary<string, HashSet<string>>();
var providerNameToApplicationTime = new Dictionary<string, TimeSpan>();
var providerNameToHasConflict = new Dictionary<string, bool>();
var providerNameToTotalCount = new Dictionary<string, int>();
var providerNameToSuccessCount = new Dictionary<string, int>();

var totalApplicationTimeStopWatch = SharedStopwatch.StartNew();
await ProducerConsumer<(CodeFixCollection collection, TimeSpan elapsedTime)>.RunParallelAsync(
await ProducerConsumer<(CodeFixCollection collection, bool success, TimeSpan elapsedTime)>.RunParallelAsync(
codeFixCollections,
produceItems: static async (codeFixCollection, callback, args, cancellationToken) =>
{
var (@this, solution, _, _, _, _, _) = args;
var (@this, solution, _, _, _, _, _, _, _) = args;
var firstAction = GetFirstAction(codeFixCollection.Fixes[0]);

var applicationTimeStopWatch = SharedStopwatch.StartNew();
var result = await firstAction.GetPreviewOperationsAsync(solution, cancellationToken).ConfigureAwait(false);
callback((codeFixCollection, applicationTimeStopWatch.Elapsed));
var success = true;
try
{
await firstAction
.GetPreviewOperationsAsync(solution, cancellationToken)
.ConfigureAwait(false);
}
catch (Exception e) when (FatalError.ReportAndCatchUnlessCanceled(e, cancellationToken))
{
success = false;
}

callback((codeFixCollection, success, applicationTimeStopWatch.Elapsed));
},
consumeItems: static async (values, args, cancellationToken) =>
{
var (@this, solution, diagnosticIdToCount, diagnosticIdToApplicationTime, diagnosticIdToProviderName, providerNameToApplicationTime, providerNameToHasConflict) = args;
var (@this, solution, diagnosticIdToCount, diagnosticIdToApplicationTime, diagnosticIdToProviderName,
providerNameToApplicationTime, providerNameToHasConflict, providerNameToTotalCount, providerNameToSuccessCount) = args;

// Track which text span each code fix says it will be fixing. We can use this to efficiently determine
// which codefixes 'conflict' with some other codefix (in that that multiple features think they can fix
// the same span of code). We would need some mechanism to determine which we would prefer to take in
// order to have a good experience in such a case.
var intervalTree = new SimpleMutableIntervalTree<CodeFixCollection, CodeFixCollectionIntervalIntrospector>(new CodeFixCollectionIntervalIntrospector());

await foreach (var (codeFixCollection, applicationTime) in values)
await foreach (var (codeFixCollection, success, applicationTime) in values)
{
var diagnosticId = codeFixCollection.FirstDiagnostic.Id;
var providerName = GetProviderName(codeFixCollection);
Expand All @@ -287,6 +302,10 @@ private async Task<CopilotCodeFixAnalysis> ComputeCodeFixAnalysisAsync(
IncrementElapsedTime(diagnosticIdToApplicationTime, diagnosticId, applicationTime);
diagnosticIdToProviderName.MultiAdd(diagnosticId, providerName);
IncrementElapsedTime(providerNameToApplicationTime, providerName, applicationTime);
IncrementCount(providerNameToTotalCount, providerName);

if (success)
IncrementCount(providerNameToSuccessCount, providerName);

intervalTree.AddIntervalInPlace(codeFixCollection);
}
Expand All @@ -311,7 +330,8 @@ private async Task<CopilotCodeFixAnalysis> ComputeCodeFixAnalysisAsync(
providerNameToHasConflict[providerName] = storedHasConflictValue || newHasConflictValue;
}
},
args: (@this: this, newDocument.Project.Solution, diagnosticIdToCount, diagnosticIdToApplicationTime, diagnosticIdToProviderName, providerNameToApplicationTime, providerNameToHasConflict),
args: (@this: this, newDocument.Project.Solution, diagnosticIdToCount, diagnosticIdToApplicationTime, diagnosticIdToProviderName,
providerNameToApplicationTime, providerNameToHasConflict, providerNameToTotalCount, providerNameToSuccessCount),
cancellationToken).ConfigureAwait(false);
var totalApplicationTime = totalApplicationTimeStopWatch.Elapsed;

Expand All @@ -322,7 +342,9 @@ private async Task<CopilotCodeFixAnalysis> ComputeCodeFixAnalysisAsync(
diagnosticIdToApplicationTime,
diagnosticIdToProviderName,
providerNameToApplicationTime,
providerNameToHasConflict);
providerNameToHasConflict,
providerNameToTotalCount,
providerNameToSuccessCount);

Task<ImmutableArray<CodeFixCollection>> ComputeCodeFixCollectionsAsync()
{
Expand Down
Loading