Move DiagnosticIncrementalAnalzyer to EditorFeatures

Refactor AnalyzerHelpers

Remove IIncementalAnalyzer2

Move DiagnosticService to LSP layer

Move DiagnosticIncrementalAnalyzer to LSP

Move *OptionsStorage types

Simplify CodeFixService

Move CodeFixService and CodeCleanupService to LSP layer

Include LSP layer in EditorFeatures test composition

src/Analyzers/Core/Analyzers/Analyzers.projitems

@@ -27,7 +27,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)FileHeaders\AbstractFileHeaderDiagnosticAnalyzer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)FileHeaders\AbstractFileHeaderHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)FileHeaders\FileHeader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AnalyzerHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AnalyzerOptionsExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\DeserializationConstructorCheck.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\DiagnosticHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EnforceOnBuildValues.cs" />

src/Analyzers/Core/Analyzers/Helpers/AnalyzerHelper.cs → src/Analyzers/Core/Analyzers/Helpers/AnalyzerOptionsExtensions.cs

@@ -3,7 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Options;
+using Roslyn.Utilities;
 
 #if CODE_STYLE
 using TOption = Microsoft.CodeAnalysis.Options.IOption2;
@@ -45,7 +50,7 @@ public static IdeAnalyzerOptions From(OptionSet options, string language)
 #endif
     }
 
-    internal static partial class AnalyzerHelper
+    internal static partial class AnalyzerOptionsExtensions
     {
         public static IdeAnalyzerOptions GetIdeOptions(this AnalyzerOptions options)
 #if CODE_STYLE
@@ -60,7 +65,7 @@ public static T GetOption<T>(this SemanticModelAnalysisContext context, Option2<
             var syntaxTree = context.SemanticModel.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this SyntaxNodeAnalysisContext context, Option2<T> option)
@@ -69,7 +74,7 @@ public static T GetOption<T>(this SyntaxNodeAnalysisContext context, Option2<T>
             var syntaxTree = context.Node.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this SyntaxTreeAnalysisContext context, Option2<T> option)
@@ -78,7 +83,7 @@ public static T GetOption<T>(this SyntaxTreeAnalysisContext context, Option2<T>
             var syntaxTree = context.Tree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this OperationAnalysisContext context, Option2<T> option)
@@ -87,7 +92,7 @@ public static T GetOption<T>(this OperationAnalysisContext context, Option2<T> o
             var syntaxTree = context.Operation.Syntax.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this SemanticModelAnalysisContext context, PerLanguageOption2<T> option, string? language)
@@ -96,7 +101,7 @@ public static T GetOption<T>(this SemanticModelAnalysisContext context, PerLangu
             var syntaxTree = context.SemanticModel.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, language, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this SyntaxNodeAnalysisContext context, PerLanguageOption2<T> option, string? language)
@@ -105,7 +110,7 @@ public static T GetOption<T>(this SyntaxNodeAnalysisContext context, PerLanguage
             var syntaxTree = context.Node.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, language, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this SyntaxTreeAnalysisContext context, PerLanguageOption2<T> option, string? language)
@@ -114,7 +119,7 @@ public static T GetOption<T>(this SyntaxTreeAnalysisContext context, PerLanguage
             var syntaxTree = context.Tree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, language, syntaxTree, cancellationToken);
         }
 
         public static T GetOption<T>(this OperationAnalysisContext context, PerLanguageOption2<T> option, string? language)
@@ -123,7 +128,7 @@ public static T GetOption<T>(this OperationAnalysisContext context, PerLanguageO
             var syntaxTree = context.Operation.Syntax.SyntaxTree;
             var cancellationToken = context.CancellationToken;
 
-            return GetOption(analyzerOptions, option, language, syntaxTree, cancellationToken);
+            return analyzerOptions.GetOption(option, language, syntaxTree, cancellationToken);
         }
 
         public static bool TryGetEditorConfigOption<T>(this AnalyzerOptions analyzerOptions, TOption option, SyntaxTree syntaxTree, [MaybeNullWhen(false)] out T value)

src/Analyzers/Core/Analyzers/ValidateFormatString/AbstractValidateFormatStringDiagnosticAnalyzer.cs

@@ -85,7 +85,7 @@ public override void Initialize(AnalysisContext context)
 
         [PerformanceSensitive(
             "https://github.com/dotnet/roslyn/issues/23583",
-            Constraint = nameof(AnalyzerHelper.GetOption) + " is expensive and should be avoided if a syntax-based fast path exists.")]
+            Constraint = nameof(AnalyzerOptionsExtensions.GetOption) + " is expensive and should be avoided if a syntax-based fast path exists.")]
         private void AnalyzeNode(SyntaxNodeAnalysisContext context, INamedTypeSymbol formatProviderType)
         {
             var syntaxFacts = GetSyntaxFacts();

src/CodeStyle/Core/Analyzers/Options/AnalyzerHelper.cs → src/CodeStyle/Core/Analyzers/Options/AnalyzerOptionsExtensions.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.Diagnostics
 {
-    internal static partial class AnalyzerHelper
+    internal static partial class AnalyzerOptionsExtensions
     {
 #pragma warning disable IDE0060 // Remove unused parameter - Needed to share this method signature between CodeStyle and Features layer.
         public static T GetOption<T>(this AnalyzerOptions analyzerOptions, IOption2 option, string? language, SyntaxTree syntaxTree, CancellationToken cancellationToken)

src/EditorFeatures/CSharpTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.cs

@@ -341,7 +341,7 @@ public async Task TestDiagnosticSpan()
             var compilerEngineCompilation = (CSharpCompilation)(await compilerEngineWorkspace.CurrentSolution.Projects.Single().GetRequiredCompilationAsync(CancellationToken.None));
 
             var diagnostics = compilerEngineCompilation.GetAnalyzerDiagnostics(new[] { analyzer });
-            AssertEx.Any(diagnostics, d => d.Id == AnalyzerHelper.AnalyzerExceptionDiagnosticId);
+            AssertEx.Any(diagnostics, d => d.Id == DocumentAnalysisExecutor.AnalyzerExceptionDiagnosticId);
         }
 
         private class InvalidSpanAnalyzer : DiagnosticAnalyzer

src/EditorFeatures/Core/Shared/Preview/PreviewSolutionCrawlerRegistrationService.cs

@@ -97,9 +97,9 @@ private async Task AnalyzeAsync()
                             await incrementalAnalyzer.AnalyzeSyntaxAsync(document, InvocationReasons.Empty, _source.Token).ConfigureAwait(false);
                             await incrementalAnalyzer.AnalyzeDocumentAsync(document, bodyOpt: null, reasons: InvocationReasons.Empty, cancellationToken: _source.Token).ConfigureAwait(false);
                         }
-                        else if (incrementalAnalyzer is IIncrementalAnalyzer2 incrementalAnalyzer2)
+                        else
                         {
-                            await incrementalAnalyzer2.AnalyzeNonSourceDocumentAsync(textDocument, InvocationReasons.Empty, _source.Token).ConfigureAwait(false);
+                            await incrementalAnalyzer.AnalyzeNonSourceDocumentAsync(textDocument, InvocationReasons.Empty, _source.Token).ConfigureAwait(false);
                         }
 
                         // don't call project one.

src/EditorFeatures/Test/Diagnostics/AnalyzerLoadFailureTests.cs

@@ -34,7 +34,7 @@ public void CanCreateDiagnosticForAnalyzerLoadFailure(
 
             // Ensure CreateAnalyzerLoadFailureDiagnostic doesn't fail when called. We don't assert much about the resulting
             // diagnostic -- this is primarly to ensure we don't forget to update it if a new error code is added.
-            var diagnostic = AnalyzerHelper.CreateAnalyzerLoadFailureDiagnostic(eventArgs, "Analyzer.dll", null, languageName);
+            var diagnostic = DocumentAnalysisExecutor.CreateAnalyzerLoadFailureDiagnostic(eventArgs, "Analyzer.dll", null, languageName);
             Assert.Equal(languageName, diagnostic.Language);
 
             if (expectsTypeName)

src/EditorFeatures/Test/Diagnostics/DiagnosticAnalyzerServiceTests.cs

@@ -36,7 +36,7 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics
     [UseExportProvider]
     public class DiagnosticAnalyzerServiceTests
     {
-        private static readonly TestComposition s_featuresCompositionWithMockDiagnosticUpdateSourceRegistrationService = FeaturesTestCompositions.Features
+        private static readonly TestComposition s_featuresCompositionWithMockDiagnosticUpdateSourceRegistrationService = EditorTestCompositions.EditorFeatures
             .AddExcludedPartTypes(typeof(IDiagnosticUpdateSourceRegistrationService))
             .AddParts(typeof(MockDiagnosticUpdateSourceRegistrationService))
             .AddParts(typeof(TestDocumentTrackingService));
@@ -1246,9 +1246,9 @@ private static async Task RunAllAnalysisAsync(IIncrementalAnalyzer analyzer, Tex
                 await analyzer.AnalyzeSyntaxAsync(document, InvocationReasons.Empty, CancellationToken.None).ConfigureAwait(false);
                 await analyzer.AnalyzeDocumentAsync(document, bodyOpt: null, reasons: InvocationReasons.Empty, cancellationToken: CancellationToken.None).ConfigureAwait(false);
             }
-            else if (analyzer is IIncrementalAnalyzer2 analyzer2)
+            else
             {
-                await analyzer2.AnalyzeNonSourceDocumentAsync(textDocument, InvocationReasons.Empty, CancellationToken.None).ConfigureAwait(false);
+                await analyzer.AnalyzeNonSourceDocumentAsync(textDocument, InvocationReasons.Empty, CancellationToken.None).ConfigureAwait(false);
             }
 
             await analyzer.AnalyzeProjectAsync(textDocument.Project, semanticsChanged: true, reasons: InvocationReasons.Empty, cancellationToken: CancellationToken.None).ConfigureAwait(false);

src/EditorFeatures/Test/Diagnostics/DiagnosticServiceTests.cs

@@ -34,7 +34,7 @@ private static DiagnosticService GetDiagnosticService(TestWorkspace workspace)
         [Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)]
         public async Task TestGetDiagnostics1()
         {
-            using var workspace = new TestWorkspace(composition: FeaturesTestCompositions.Features);
+            using var workspace = new TestWorkspace(composition: EditorTestCompositions.EditorFeatures);
             var mutex = new ManualResetEvent(false);
             var document = workspace.CurrentSolution.AddProject("TestProject", "TestProject", LanguageNames.CSharp).AddDocument("TestDocument", string.Empty);
 
@@ -65,7 +65,7 @@ public async Task TestGetDiagnostics1()
         [Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)]
         public async Task TestGetDiagnostics2()
         {
-            using var workspace = new TestWorkspace(composition: FeaturesTestCompositions.Features);
+            using var workspace = new TestWorkspace(composition: EditorTestCompositions.EditorFeatures);
             var mutex = new ManualResetEvent(false);
             var document = workspace.CurrentSolution.AddProject("TestProject", "TestProject", LanguageNames.CSharp).AddDocument("TestDocument", string.Empty);
             var document2 = document.Project.AddDocument("TestDocument2", string.Empty);
@@ -109,7 +109,7 @@ public async Task TestGetDiagnostics2()
         [Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)]
         public async Task TestCleared()
         {
-            using var workspace = new TestWorkspace(composition: FeaturesTestCompositions.Features);
+            using var workspace = new TestWorkspace(composition: EditorTestCompositions.EditorFeatures);
             var mutex = new ManualResetEvent(false);
             var document = workspace.CurrentSolution.AddProject("TestProject", "TestProject", LanguageNames.CSharp).AddDocument("TestDocument", string.Empty);
             var document2 = document.Project.AddDocument("TestDocument2", string.Empty);

src/EditorFeatures/Test/SolutionCrawler/WorkCoordinatorTests.cs

@@ -1628,7 +1628,7 @@ internal static class Metadata
             public static readonly IncrementalAnalyzerProviderMetadata Crawler = new IncrementalAnalyzerProviderMetadata(new Dictionary<string, object> { { "WorkspaceKinds", new[] { SolutionCrawlerWorkspaceKind } }, { "HighPriorityForActiveFile", false }, { "Name", "TestAnalyzer" } });
         }
 
-        private class Analyzer : IIncrementalAnalyzer2
+        private class Analyzer : IIncrementalAnalyzer
         {
             public static readonly Option2<bool> TestOption = new Option2<bool>("TestOptions", "TestOption", defaultValue: true);
 
@@ -1776,6 +1776,13 @@ public Task NonSourceDocumentCloseAsync(TextDocument textDocument, CancellationT
 
             public Task NonSourceDocumentResetAsync(TextDocument textDocument, CancellationToken cancellationToken)
                 => Task.CompletedTask;
+
+            public void LogAnalyzerCountSummary()
+            {
+            }
+
+            public int Priority => 1;
+
             #endregion
         }
 
@@ -1800,6 +1807,17 @@ public Task AnalyzeDocumentAsync(Document document, SyntaxNode bodyOpt, Invocati
             public Task AnalyzeProjectAsync(Project project, bool semanticsChanged, InvocationReasons reasons, CancellationToken cancellationToken) => Task.CompletedTask;
             public Task RemoveDocumentAsync(DocumentId documentId, CancellationToken cancellationToken) => Task.CompletedTask;
             public Task RemoveProjectAsync(ProjectId projectId, CancellationToken cancellationToken) => Task.CompletedTask;
+            public Task NonSourceDocumentOpenAsync(TextDocument textDocument, CancellationToken cancellationToken) => Task.CompletedTask;
+            public Task NonSourceDocumentCloseAsync(TextDocument textDocument, CancellationToken cancellationToken) => Task.CompletedTask;
+            public Task NonSourceDocumentResetAsync(TextDocument textDocument, CancellationToken cancellationToken) => Task.CompletedTask;
+            public Task AnalyzeNonSourceDocumentAsync(TextDocument textDocument, InvocationReasons reasons, CancellationToken cancellationToken) => Task.CompletedTask;
+
+            public void LogAnalyzerCountSummary()
+            {
+            }
+
+            public int Priority => 1;
+
             #endregion
         }
 

src/EditorFeatures/TestUtilities/EditorTestCompositions.cs

@@ -64,7 +64,8 @@ public static class EditorTestCompositions
                 typeof(TextEditorResources).Assembly,
                 typeof(EditorFeaturesResources).Assembly,
                 typeof(CSharp.CSharpEditorResources).Assembly,
-                typeof(VisualBasic.VBEditorResources).Assembly);
+                typeof(VisualBasic.VBEditorResources).Assembly,
+                typeof(LanguageServerResources).Assembly);
 
         public static readonly TestComposition EditorFeaturesWpf = EditorFeatures
             .AddAssemblies(
@@ -76,11 +77,6 @@ public static class EditorTestCompositions
             .AddParts(
                 typeof(TestInteractiveWindowEditorFactoryService));
 
-        public static readonly TestComposition LanguageServerProtocol = EditorFeatures
-            .AddAssemblies(
-                typeof(LanguageServerResources).Assembly);
-
-        public static readonly TestComposition LanguageServerProtocolWpf = EditorFeaturesWpf
-            .AddAssemblies(LanguageServerProtocol.Assemblies);
+        public static readonly TestComposition LanguageServerProtocol = EditorFeatures;
     }
 }

src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs

@@ -39,8 +39,7 @@ namespace Roslyn.Test.Utilities
     [UseExportProvider]
     public abstract partial class AbstractLanguageServerProtocolTests
     {
-        // TODO: remove WPF dependency (IEditorInlineRenameService)
-        private static readonly TestComposition s_composition = EditorTestCompositions.LanguageServerProtocolWpf
+        private static readonly TestComposition s_composition = EditorTestCompositions.LanguageServerProtocol
             .AddParts(typeof(TestDocumentTrackingService))
             .AddParts(typeof(TestWorkspaceRegistrationService))
             .AddParts(typeof(TestSyntaxTreeConfigurationService))