HACK: combine style and analyzer passes

corngood · Nov 23, 2023 · 89fff84 · 89fff84
1 parent 8f3e8a0
commit 89fff84
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/src/Analyzers/AnalyzerFormatter.cs b/src/Analyzers/AnalyzerFormatter.cs
@@ -15,15 +15,15 @@ namespace Microsoft.CodeAnalysis.Tools.Analyzers
 {
     internal class AnalyzerFormatter : ICodeFormatter
     {
-        public static AnalyzerFormatter CodeStyleFormatter => new AnalyzerFormatter(
-            Resources.Code_Style,
-            FixCategory.CodeStyle,
-            includeCompilerDiagnostics: false,
-            new CodeStyleInformationProvider(),
-            new AnalyzerRunner(),
-            new SolutionCodeFixApplier());
-
-        public static AnalyzerFormatter ThirdPartyFormatter => new AnalyzerFormatter(
+        // public static ICodeFormatter CodeStyleFormatter => new AnalyzerFormatter(
+        //     Resources.Code_Style,
+        //     FixCategory.CodeStyle,
+        //     includeCompilerDiagnostics: false,
+        //     new CodeStyleInformationProvider(),
+        //     new AnalyzerRunner(),
+        //     new SolutionCodeFixApplier());
+
+        public static ICodeFormatter Default => new AnalyzerFormatter(
             Resources.Analyzer_Reference,
             FixCategory.Analyzers,
             includeCompilerDiagnostics: true,

diff --git a/src/Analyzers/AnalyzerReferenceInformationProvider.cs b/src/Analyzers/AnalyzerReferenceInformationProvider.cs
@@ -23,8 +23,20 @@ public ImmutableDictionary<ProjectId, AnalyzersAndFixers> GetAnalyzersAndFixers(
             FormatOptions formatOptions,
             ILogger logger)
         {
-            return solution.Projects
+            var output = solution.Projects
                 .ToImmutableDictionary(project => project.Id, GetAnalyzersAndFixers);
+
+            var style = new CodeStyleInformationProvider().GetAnalyzersAndFixers(solution, formatOptions, logger);
+
+            return output
+                .Concat(style)
+                .GroupBy(x => x.Key, x => x.Value)
+                .ToDictionary(
+                    x => x.Key,
+                    x => new AnalyzersAndFixers(
+                        x.SelectMany(x => x.Analyzers).ToImmutableArray(),
+                        x.SelectMany(x => x.Fixers).ToImmutableArray()))
+                .ToImmutableDictionary();
         }
 
         private AnalyzersAndFixers GetAnalyzersAndFixers(Project project)

diff --git a/src/CodeFormatter.cs b/src/CodeFormatter.cs
@@ -24,8 +24,7 @@ internal static class CodeFormatter
             new EndOfLineFormatter(),
             new CharsetFormatter(),
             new OrganizeImportsFormatter(),
-            AnalyzerFormatter.CodeStyleFormatter,
-            AnalyzerFormatter.ThirdPartyFormatter);
+            AnalyzerFormatter.Default);
 
         public static async Task<WorkspaceFormatResult> FormatWorkspaceAsync(
             FormatOptions formatOptions,

diff --git a/tests/Analyzers/CodeStyleAnalyzerFormatterTests.cs b/tests/Analyzers/CodeStyleAnalyzerFormatterTests.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Tools.Tests.Analyzers
 {
     public class CodeStyleAnalyzerFormatterTests : CSharpFormatterTests
     {
-        private protected override ICodeFormatter Formatter => AnalyzerFormatter.CodeStyleFormatter;
+        private protected override ICodeFormatter Formatter => AnalyzerFormatter.Default;
 
         public CodeStyleAnalyzerFormatterTests(ITestOutputHelper output)
         {

diff --git a/tests/Analyzers/ThirdPartyAnalyzerFormatterTests.cs b/tests/Analyzers/ThirdPartyAnalyzerFormatterTests.cs
@@ -21,7 +21,7 @@ public class ThirdPartyAnalyzerFormatterTests : CSharpFormatterTests, IAsyncLife
     {
         private static readonly string s_analyzerProjectFilePath = Path.Combine("for_analyzer_formatter", "analyzer_project", "analyzer_project.csproj");
 
-        private protected override ICodeFormatter Formatter => AnalyzerFormatter.ThirdPartyFormatter;
+        private protected override ICodeFormatter Formatter => AnalyzerFormatter.Default;
 
         private Project _analyzerReferencesProject;
 

diff --git a/tests/Formatters/UnnecessaryImportsFormatterTests.cs b/tests/Formatters/UnnecessaryImportsFormatterTests.cs
@@ -20,7 +20,7 @@ public class UnnecessaryImportsFormatterTests : CSharpFormatterTests
         private const string RemoveUnnecessaryImportCategoryKey =
             AnalyzerOptionsExtensions.DotnetAnalyzerDiagnosticPrefix + "." + AnalyzerOptionsExtensions.CategoryPrefix + "-" + Style + "." + AnalyzerOptionsExtensions.SeveritySuffix;
 
-        private protected override ICodeFormatter Formatter => AnalyzerFormatter.CodeStyleFormatter;
+        private protected override ICodeFormatter Formatter => AnalyzerFormatter.Default;
 
         public UnnecessaryImportsFormatterTests(ITestOutputHelper output)
         {