Skip to content
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.

Sign up for GitHub

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

Fix #69628 Analyzer summary should show suppressor ID #72569

Merged
merged 3 commits into from
Mar 20, 2024
Merged

Fix #69628 Analyzer summary should show suppressor ID #72569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8290bb4
Show suppressor ids in analyser report
juan-diaz-at-nicklaus Mar 15, 2024
881bf0e
Reuse old test
juan-diaz-at-nicklaus Mar 15, 2024
82b2d41
Merge branch 'main' into users/jcdiaz/issue-69628
juan-diaz-at-nicklaus Mar 15, 2024
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
3 changes: 2 additions & 1 deletion src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9353,13 +9353,14 @@ public void ReportAnalyzerOutput()
responseFile: null,
srcDirectory,
new[] { "/reportanalyzer", "/t:library", srcFile.Path },
analyzers: new[] { new WarningDiagnosticAnalyzer() },
analyzers: [new WarningDiagnosticAnalyzer(), new DiagnosticSuppressorForId("Warning01", "Suppressor01")],
generators: new[] { new DoNothingGenerator().AsSourceGenerator() });
var exitCode = csc.Run(outWriter);
Assert.Equal(0, exitCode);
var output = outWriter.ToString();
Assert.Contains(CodeAnalysisResources.AnalyzerExecutionTimeColumnHeader, output, StringComparison.Ordinal);
Assert.Contains($"{nameof(WarningDiagnosticAnalyzer)} (Warning01)", output, StringComparison.Ordinal);
Assert.Contains($"{nameof(DiagnosticSuppressorForId)} (Suppressor01)", output, StringComparison.Ordinal);
Assert.Contains(CodeAnalysisResources.GeneratorNameColumnHeader, output, StringComparison.Ordinal);
Assert.Contains(typeof(DoNothingGenerator).FullName, output, StringComparison.Ordinal);
CleanupAllGeneratedFiles(srcFile.Path);
Expand Down
9 changes: 8 additions & 1 deletion src/Compilers/Core/Portable/CommandLine/ReportAnalyzerUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private static void ReportAnalyzerExecutionTime(TextWriter consoleOutput, Analyz
executionTime = kvp.Value.TotalSeconds;
percentage = (int)(executionTime * 100 / totalAnalyzerExecutionTime);

var analyzerIds = string.Join(", ", kvp.Key.SupportedDiagnostics.Select(d => d.Id).Distinct().OrderBy(id => id));
var analyzerIds = string.Join(", ", GetSupportedIds(kvp.Key).Distinct().OrderBy(id => id));
var analyzerNameColumn = $" {kvp.Key} ({analyzerIds})";
consoleOutput.WriteLine(GetColumnEntry(executionTime, percentage, analyzerNameColumn, culture));
}
Expand All @@ -102,6 +102,13 @@ private static void ReportAnalyzerExecutionTime(TextWriter consoleOutput, Analyz
}
}

private static IEnumerable<string> GetSupportedIds(DiagnosticAnalyzer analyzer)
=> analyzer switch
{
DiagnosticSuppressor suppressor => suppressor.SupportedSuppressions.Select(s => s.Id),
_ => analyzer.SupportedDiagnostics.Select(d => d.Id),
};

private static void ReportGeneratorExecutionTime(TextWriter consoleOutput, GeneratorDriverTimingInfo driverTimingInfo, CultureInfo culture)
{
if (driverTimingInfo.GeneratorTimes.IsEmpty)
Expand Down