AnalyzerFormatter: add support for DiagnosticSuppressor

corngood · Nov 23, 2023 · fa99c15 · fa99c15
1 parent 89fff84
commit fa99c15
Showing 1 changed file with 24 additions and 1 deletion.
diff --git a/src/Analyzers/AnalyzerFormatter.cs b/src/Analyzers/AnalyzerFormatter.cs
@@ -308,9 +308,17 @@ static bool ContainsFixableId(CodeFixProvider fixer, string id)
 
                 // Filter analyzers by project's language
                 var filteredAnalyzer = projectAnalyzersAndFixers[projectId].Analyzers
-                    .Where(analyzer => DoesAnalyzerSupportLanguage(analyzer, project.Language));
+                    .Where(analyzer => DoesAnalyzerSupportLanguage(analyzer, project.Language))
+                    .ToImmutableArray();
+
                 foreach (var analyzer in filteredAnalyzer)
                 {
+                    // We'll deal with these after we have a list of diagnostics
+                    if (analyzer is DiagnosticSuppressor)
+                    {
+                        continue;
+                    }
+
                     // Filter by excluded diagnostics
                     if (!excludeDiagnostics.IsEmpty &&
                         analyzer.SupportedDiagnostics.All(descriptor => excludeDiagnostics.Contains(descriptor.Id)))
@@ -340,6 +348,21 @@ static bool ContainsFixableId(CodeFixProvider fixer, string id)
                     }
                 }
 
+                var analyzerDiagnostics = analyzers
+                    .SelectMany(analyzer => analyzer.SupportedDiagnostics)
+                    .Select(descriptor => descriptor.Id)
+                    .ToImmutableHashSet();
+
+                foreach (var analyzer in filteredAnalyzer)
+                {
+                    if (analyzer is DiagnosticSuppressor suppressor &&
+                        suppressor.SupportedSuppressions.Any(
+                            descriptor => analyzerDiagnostics.Contains(descriptor.SuppressedDiagnosticId)))
+                    {
+                        analyzers.Add(analyzer);
+                    }
+                }
+
                 projectAnalyzers.Add(projectId, analyzers.ToImmutableArray());
             }