Merge pull request #750 from JoeRobich/include-compiler-diagnostics

Only include compiler diagnostics if a fixer supports them

src/Analyzers/AnalyzerFormatter.cs

@@ -49,6 +49,11 @@ internal class AnalyzerFormatter : ICodeFormatter
                 return solution;
             }
 
+            // Only include compiler diagnostics if we have a fixer that can fix them.
+            var includeCompilerDiagnostics = fixers.Any(
+                codefix => codefix.FixableDiagnosticIds.Any(
+                    id => id.StartsWith("CS") || id.StartsWith("BC")));
+
             var analysisStopwatch = Stopwatch.StartNew();
             logger.LogTrace(Resources.Running_0_analysis, _name);
 
@@ -63,15 +68,15 @@ internal class AnalyzerFormatter : ICodeFormatter
             var projectAnalyzers = await FilterBySeverityAsync(solution.Projects, analyzers, formattablePaths, severity, cancellationToken).ConfigureAwait(false);
 
             // Determine which diagnostics are being reported for each project.
-            var projectDiagnostics = await GetProjectDiagnosticsAsync(solution, projectAnalyzers, formattablePaths, formatOptions, severity, logger, formattedFiles, cancellationToken).ConfigureAwait(false);
+            var projectDiagnostics = await GetProjectDiagnosticsAsync(solution, projectAnalyzers, formattablePaths, formatOptions, severity, includeCompilerDiagnostics, logger, formattedFiles, cancellationToken).ConfigureAwait(false);
 
             var projectDiagnosticsMS = analysisStopwatch.ElapsedMilliseconds;
             logger.LogTrace(Resources.Complete_in_0_ms, projectDiagnosticsMS);
 
             logger.LogTrace(Resources.Fixing_diagnostics);
 
             // Run each analyzer individually and apply fixes if possible.
-            solution = await FixDiagnosticsAsync(solution, analyzers, fixers, projectDiagnostics, formattablePaths, severity, logger, cancellationToken).ConfigureAwait(false);
+            solution = await FixDiagnosticsAsync(solution, analyzers, fixers, projectDiagnostics, formattablePaths, severity, includeCompilerDiagnostics, logger, cancellationToken).ConfigureAwait(false);
 
             var fixDiagnosticsMS = analysisStopwatch.ElapsedMilliseconds - projectDiagnosticsMS;
             logger.LogTrace(Resources.Complete_in_0_ms, fixDiagnosticsMS);
@@ -87,6 +92,7 @@ internal class AnalyzerFormatter : ICodeFormatter
             ImmutableHashSet<string> formattablePaths,
             FormatOptions options,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             List<FormattedFile> formattedFiles,
             CancellationToken cancellationToken)
@@ -101,7 +107,7 @@ internal class AnalyzerFormatter : ICodeFormatter
                 }
 
                 // Run all the filtered analyzers to determine which are reporting diagnostic.
-                await _runner.RunCodeAnalysisAsync(result, analyzers, project, formattablePaths, severity, logger, cancellationToken).ConfigureAwait(false);
+                await _runner.RunCodeAnalysisAsync(result, analyzers, project, formattablePaths, severity, includeCompilerDiagnostics, logger, cancellationToken).ConfigureAwait(false);
             }
 
             LogDiagnosticLocations(solution, result.Diagnostics.SelectMany(kvp => kvp.Value), options.WorkspaceFilePath, options.ChangesAreErrors, logger, formattedFiles);
@@ -143,6 +149,7 @@ static void LogDiagnosticLocations(Solution solution, IEnumerable<Diagnostic> di
             ImmutableDictionary<ProjectId, ImmutableHashSet<string>> projectDiagnostics,
             ImmutableHashSet<string> formattablePaths,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             CancellationToken cancellationToken)
         {
@@ -180,7 +187,7 @@ static void LogDiagnosticLocations(Solution solution, IEnumerable<Diagnostic> di
                     }
 
                     var analyzers = analyzersByLanguage[project.Language];
-                    await _runner.RunCodeAnalysisAsync(result, analyzers, project, formattablePaths, severity, logger, cancellationToken).ConfigureAwait(false);
+                    await _runner.RunCodeAnalysisAsync(result, analyzers, project, formattablePaths, severity, includeCompilerDiagnostics, logger, cancellationToken).ConfigureAwait(false);
                 }
 
                 var hasDiagnostics = result.Diagnostics.Any(kvp => kvp.Value.Count > 0);

src/Analyzers/AnalyzerRunner.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Diagnostics;
@@ -11,29 +10,24 @@ namespace Microsoft.CodeAnalysis.Tools.Analyzers
 {
     internal partial class AnalyzerRunner : IAnalyzerRunner
     {
-        private readonly bool _includeComplilerDiagnostics;
-
-        public AnalyzerRunner(bool includeCompilerDiagnostics)
-        {
-            _includeComplilerDiagnostics = includeCompilerDiagnostics;
-        }
-
         public Task RunCodeAnalysisAsync(
             CodeAnalysisResult result,
             DiagnosticAnalyzer analyzers,
             Project project,
             ImmutableHashSet<string> formattableDocumentPaths,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             CancellationToken cancellationToken)
-            => RunCodeAnalysisAsync(result, ImmutableArray.Create(analyzers), project, formattableDocumentPaths, severity, logger, cancellationToken);
+            => RunCodeAnalysisAsync(result, ImmutableArray.Create(analyzers), project, formattableDocumentPaths, severity, includeCompilerDiagnostics, logger, cancellationToken);
 
         public async Task RunCodeAnalysisAsync(
             CodeAnalysisResult result,
             ImmutableArray<DiagnosticAnalyzer> analyzers,
             Project project,
             ImmutableHashSet<string> formattableDocumentPaths,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             CancellationToken cancellationToken)
         {
@@ -45,7 +39,7 @@ public AnalyzerRunner(bool includeCompilerDiagnostics)
 
             // If are not running any analyzers and are not reporting compiler diagnostics, then there is
             // nothing to report.
-            if (analyzers.IsEmpty && !_includeComplilerDiagnostics)
+            if (analyzers.IsEmpty && !includeCompilerDiagnostics)
             {
                 return;
             }
@@ -64,7 +58,7 @@ public AnalyzerRunner(bool includeCompilerDiagnostics)
                     logAnalyzerExecutionTime: false,
                     reportSuppressedDiagnostics: false);
                 var analyzerCompilation = compilation.WithAnalyzers(analyzers, analyzerOptions);
-                diagnostics = _includeComplilerDiagnostics
+                diagnostics = includeCompilerDiagnostics
                     ? await analyzerCompilation.GetAllDiagnosticsAsync(cancellationToken).ConfigureAwait(false)
                     : await analyzerCompilation.GetAnalyzerDiagnosticsAsync(cancellationToken).ConfigureAwait(false);
             }

src/Analyzers/Interfaces/IAnalyzerRunner.cs

@@ -16,6 +16,7 @@ internal interface IAnalyzerRunner
             Project project,
             ImmutableHashSet<string> formattableDocumentPaths,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             CancellationToken cancellationToken);
 
@@ -25,6 +26,7 @@ internal interface IAnalyzerRunner
             Project project,
             ImmutableHashSet<string> formattableDocumentPaths,
             DiagnosticSeverity severity,
+            bool includeCompilerDiagnostics,
             ILogger logger,
             CancellationToken cancellationToken);
     }

src/CodeFormatter.cs

@@ -29,8 +29,8 @@ internal static class CodeFormatter
             new EndOfLineFormatter(),
             new CharsetFormatter(),
             new ImportsFormatter(),
-            new AnalyzerFormatter(Resources.Code_Style, new CodeStyleInformationProvider(), new AnalyzerRunner(includeCompilerDiagnostics: true), new SolutionCodeFixApplier()),
-            new AnalyzerFormatter(Resources.Analyzer_Reference, new AnalyzerReferenceInformationProvider(), new AnalyzerRunner(includeCompilerDiagnostics: true), new SolutionCodeFixApplier()),
+            new AnalyzerFormatter(Resources.Code_Style, new CodeStyleInformationProvider(), new AnalyzerRunner(), new SolutionCodeFixApplier()),
+            new AnalyzerFormatter(Resources.Analyzer_Reference, new AnalyzerReferenceInformationProvider(), new AnalyzerRunner(), new SolutionCodeFixApplier()),
         }.ToImmutableArray();
 
         public static async Task<WorkspaceFormatResult> FormatWorkspaceAsync(