Apply source suppressions

dotnet · Feb 20, 2023 · 8ca43c1 · 8ca43c1
1 parent e34f9b1
commit 8ca43c1
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Compilers/Core/Portable/SourceGeneration/GeneratorDriver.cs b/src/Compilers/Core/Portable/SourceGeneration/GeneratorDriver.cs
@@ -372,14 +372,20 @@ private static GeneratorState SetGeneratorException(Compilation compilation, Com
 
         private static ImmutableArray<Diagnostic> FilterDiagnostics(Compilation compilation, ImmutableArray<Diagnostic> generatorDiagnostics, DiagnosticBag? driverDiagnostics, CancellationToken cancellationToken)
         {
+            if (driverDiagnostics is null && generatorDiagnostics.IsEmpty)
+            {
+                return generatorDiagnostics;
+            }
+
+            var suppressMessageState = new SuppressMessageAttributeState(compilation);
             ArrayBuilder<Diagnostic> filteredDiagnostics = ArrayBuilder<Diagnostic>.GetInstance();
             foreach (var diag in generatorDiagnostics)
             {
-                var filtered = compilation.Options.FilterDiagnostic(diag, cancellationToken);
-                if (filtered is object)
+                if (compilation.Options.FilterDiagnostic(diag, cancellationToken) is { } filtered &&
+                    suppressMessageState.ApplySourceSuppressions(filtered) is { } effective)
                 {
-                    filteredDiagnostics.Add(filtered);
-                    driverDiagnostics?.Add(filtered);
+                    filteredDiagnostics.Add(effective);
+                    driverDiagnostics?.Add(effective);
                 }
             }
             return filteredDiagnostics.ToImmutableAndFree();