Merge pull request #73358 from CyrusNajmabadi/simplifyScope

dotnet · May 7, 2024 · 6f1513d · 6f1513d
2 parents 409adb8 + a65103a
commit 6f1513d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionBatchFixAllProvider.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionBatchFixAllProvider.cs
@@ -96,16 +96,11 @@ internal abstract class AbstractSuppressionBatchFixAllProvider : FixAllProvider
                 source,
                 produceItems: static async (tuple, callback, args, cancellationToken) =>
                 {
+                    using var _ = args.progressTracker.ItemCompletedScope();
+
                     var (document, diagnosticsToFix) = tuple;
-                    try
-                    {
-                        await args.@this.AddDocumentFixesAsync(
-                            document, diagnosticsToFix, callback, args.fixAllState, cancellationToken).ConfigureAwait(false);
-                    }
-                    finally
-                    {
-                        args.progressTracker.ItemCompleted();
-                    }
+                    await args.@this.AddDocumentFixesAsync(
+                        document, diagnosticsToFix, callback, args.fixAllState, cancellationToken).ConfigureAwait(false);
                 },
                 args: (@this: this, fixAllState, progressTracker),
                 cancellationToken).ConfigureAwait(false);

diff --git a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllContextHelper.cs b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/FixAllContextHelper.cs
@@ -79,14 +79,8 @@ public static async Task<ImmutableDictionary<Document, ImmutableArray<Diagnostic
                         source: projectsToFix,
                         produceItems: static async (projectToFix, callback, args, cancellationToken) =>
                         {
-                            try
-                            {
-                                callback(await args.fixAllContext.GetAllDiagnosticsAsync(projectToFix).ConfigureAwait(false));
-                            }
-                            finally
-                            {
-                                args.progressTracker.ItemCompleted();
-                            }
+                            using var _ = args.progressTracker.ItemCompletedScope();
+                            callback(await args.fixAllContext.GetAllDiagnosticsAsync(projectToFix).ConfigureAwait(false));
                         },
                         consumeItems: static async (results, args, cancellationToken) =>
                         {