Merge pull request #60317 from CyrusNajmabadi/tsFixer

Fix issue when multiple different diagnostics share a single fixer
dotnet · Mar 23, 2022 · 3fb22f1 · 3fb22f1
2 parents df7da42 + 8395cf4
commit 3fb22f1
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs b/src/Features/LanguageServer/Protocol/Features/CodeFixes/CodeFixService.cs
@@ -354,11 +354,13 @@ private async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
             var isInteractive = document.Project.Solution.Workspace.Kind == WorkspaceKind.Interactive;
 
             // gather CodeFixProviders for all distinct diagnostics found for current span
-            using var _1 = ArrayBuilder<CodeFixProvider>.GetInstance(out var allFixers);
-            using var _2 = PooledDictionary<CodeFixProvider, List<(TextSpan range, List<DiagnosticData> diagnostics)>>.GetInstance(out var fixerToRangesAndDiagnostics);
+            using var _1 = PooledDictionary<CodeFixProvider, List<(TextSpan range, List<DiagnosticData> diagnostics)>>.GetInstance(out var fixerToRangesAndDiagnostics);
+            using var _2 = PooledHashSet<CodeFixProvider>.GetInstance(out var currentFixers);
 
             foreach (var (range, diagnostics) in spanToDiagnostics)
             {
+                currentFixers.Clear();
+
                 foreach (var diagnosticId in diagnostics.Select(d => d.Id).Distinct())
                 {
                     cancellationToken.ThrowIfCancellationRequested();
@@ -385,8 +387,9 @@ private async IAsyncEnumerable<CodeFixCollection> StreamFixesAsync(
             }
 
             // Now, sort the fixers so that the ones that are ordered before others get their chance to run first.
-            if (allFixers.Count >= 2 && TryGetWorkspaceFixersPriorityMap(document, out var fixersForLanguage))
-                allFixers.Sort(new FixerComparer(allFixers, fixersForLanguage.Value));
+            var allFixers = fixerToRangesAndDiagnostics.Keys.ToImmutableArray();
+            if (TryGetWorkspaceFixersPriorityMap(document, out var fixersForLanguage))
+                allFixers = allFixers.Sort(new FixerComparer(allFixers, fixersForLanguage.Value));
 
             var extensionManager = document.Project.Solution.Workspace.Services.GetService<IExtensionManager>();
 
@@ -468,11 +471,8 @@ void AddAllFixers(
             {
                 foreach (var fixer in fixers)
                 {
-                    if (allFixers.Contains(fixer))
-                        continue;
-
-                    allFixers.Add(fixer);
-                    fixerToRangesAndDiagnostics.MultiAdd(fixer, (range, diagnostics));
+                    if (currentFixers.Add(fixer))
+                        fixerToRangesAndDiagnostics.MultiAdd(fixer, (range, diagnostics));
                 }
             }
         }
@@ -965,7 +965,7 @@ private sealed class FixerComparer : IComparer<CodeFixProvider>
             private readonly ImmutableDictionary<CodeFixProvider, int> _priorityMap;
 
             public FixerComparer(
-                ArrayBuilder<CodeFixProvider> allFixers,
+                ImmutableArray<CodeFixProvider> allFixers,
                 ImmutableDictionary<CodeFixProvider, int> priorityMap)
             {
                 _fixerToIndex = allFixers.Select((fixer, index) => (fixer, index)).ToDictionary(t => t.fixer, t => t.index);