Remove portions of solution crawler

src/EditorFeatures/CSharpTest/Formatting/CodeCleanupTests.cs

@@ -830,10 +830,6 @@ private static async Task TestThirdPartyCodeFixer<TCodefix, TAnalyzer>(string co
             project = project.AddAnalyzerConfigDocument(".editorconfig", SourceText.From(editorconfigText), filePath: @"z:\\.editorconfig").Project;
             workspace.TryApplyChanges(project.Solution);
 
-            // register this workspace to solution crawler so that analyzer service associate itself with given workspace
-            var incrementalAnalyzerProvider = workspace.ExportProvider.GetExportedValue<IDiagnosticAnalyzerService>() as IIncrementalAnalyzerProvider;
-            incrementalAnalyzerProvider.CreateIncrementalAnalyzer(workspace);
-
             var hostdoc = workspace.Documents.Single();
             var document = workspace.CurrentSolution.GetDocument(hostdoc.Id);
 
@@ -931,10 +927,6 @@ private protected static async Task AssertCodeCleanupResult(string expected, str
 
             workspace.TryApplyChanges(solution);
 
-            // register this workspace to solution crawler so that analyzer service associate itself with given workspace
-            var incrementalAnalyzerProvider = workspace.ExportProvider.GetExportedValue<IDiagnosticAnalyzerService>() as IIncrementalAnalyzerProvider;
-            incrementalAnalyzerProvider.CreateIncrementalAnalyzer(workspace);
-
             var hostdoc = workspace.Documents.Single();
             var document = workspace.CurrentSolution.GetDocument(hostdoc.Id);
 

src/EditorFeatures/Core.Wpf/Interactive/InteractiveEvaluator.cs

@@ -84,7 +84,7 @@ internal CSharpInteractiveEvaluator(
             _commandsFactory = commandsFactory;
             _commands = commands;
 
-            _workspace = new InteractiveWindowWorkspace(hostServices, editorOptionsService.GlobalOptions);
+            _workspace = new InteractiveWindowWorkspace(hostServices);
 
             _session = new InteractiveSession(
                 _workspace,

src/EditorFeatures/Core.Wpf/Interactive/InteractiveWindowWorkspace.cs

@@ -12,8 +12,8 @@ internal sealed class InteractiveWindowWorkspace : InteractiveWorkspace
     {
         public IInteractiveWindow? Window { get; set; }
 
-        public InteractiveWindowWorkspace(HostServices hostServices, IGlobalOptionService globalOptions)
-            : base(hostServices, globalOptions)
+        public InteractiveWindowWorkspace(HostServices hostServices)
+            : base(hostServices)
         {
         }
     }

src/EditorFeatures/Core/Interactive/InteractiveWorkspace.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CodeAnalysis.Host;
-using Microsoft.CodeAnalysis.Options;
-using Microsoft.CodeAnalysis.SolutionCrawler;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Text;
 using Roslyn.Utilities;
@@ -16,22 +14,9 @@ internal partial class InteractiveWorkspace : Workspace
     private SourceTextContainer? _openTextContainer;
     private DocumentId? _openDocumentId;
 
-    internal InteractiveWorkspace(HostServices hostServices, IGlobalOptionService globalOptions)
+    internal InteractiveWorkspace(HostServices hostServices)
         : base(hostServices, WorkspaceKind.Interactive)
     {
-        // register work coordinator for this workspace
-        if (globalOptions.GetOption(SolutionCrawlerRegistrationService.EnableSolutionCrawler))
-        {
-            Services.GetRequiredService<ISolutionCrawlerRegistrationService>().Register(this);
-        }
-    }
-
-    protected override void Dispose(bool finalize)
-    {
-        // workspace is going away. unregister this workspace from work coordinator
-        Services.GetRequiredService<ISolutionCrawlerRegistrationService>().Unregister(this, blockingShutdown: true);
-
-        base.Dispose(finalize);
     }
 
     public override bool CanOpenDocuments

src/EditorFeatures/Core/Preview/AbstractPreviewFactoryService.cs

@@ -701,12 +701,6 @@ private async ValueTask<IDifferenceViewerPreview<TDifferenceViewer>> CreateNewDi
             rightWorkspace = null;
         };
 
-        if (_editorOptionsService.GlobalOptions.GetOption(SolutionCrawlerRegistrationService.EnableSolutionCrawler))
-        {
-            leftWorkspace?.Target.EnableSolutionCrawler();
-            rightWorkspace?.Target.EnableSolutionCrawler();
-        }
-
         return CreateDifferenceViewerPreview(diffViewer);
     }
 

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

@@ -32,11 +32,6 @@ public PreviewWorkspace(Solution solution)
         this.RaiseWorkspaceChangedEventAsync(WorkspaceChangeKind.SolutionChanged, oldSolution, newSolution);
     }
 
-    public void EnableSolutionCrawler()
-    {
-        Services.GetRequiredService<ISolutionCrawlerRegistrationService>().Register(this);
-    }
-
     public override bool CanApplyChange(ApplyChangesKind feature)
     {
         // one can manipulate preview workspace solution as mush as they want.
@@ -107,7 +102,6 @@ protected override void Dispose(bool finalize)
     {
         base.Dispose(finalize);
 
-        Services.GetRequiredService<ISolutionCrawlerRegistrationService>().Unregister(this);
         ClearSolution();
     }
 }

src/EditorFeatures/Core/SolutionEvents/HostLegacySolutionEventsWorkspaceEventListener.cs

@@ -11,29 +11,29 @@
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;
-using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Remote;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
-using Microsoft.CodeAnalysis.SolutionCrawler;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.LegacySolutionEvents;
 
+/// <summary>
+/// Event listener that hears about workspaces and exists solely to let unit testing continue to work using their own
+/// fork of solution crawler.  Importantly, this is always active until the point that we can get unit testing to move
+/// to an entirely differently (ideally 'pull') model for test discovery.
+/// </summary>
 [ExportEventListener(WellKnownEventListeners.Workspace, WorkspaceKind.Host), Shared]
 internal sealed partial class HostLegacySolutionEventsWorkspaceEventListener : IEventListener<object>
 {
-    private readonly IGlobalOptionService _globalOptions;
     private readonly IThreadingContext _threadingContext;
     private readonly AsyncBatchingWorkQueue<WorkspaceChangeEventArgs> _eventQueue;
 
     [ImportingConstructor]
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
     public HostLegacySolutionEventsWorkspaceEventListener(
-        IGlobalOptionService globalOptions,
         IThreadingContext threadingContext,
         IAsynchronousOperationListenerProvider listenerProvider)
     {
-        _globalOptions = globalOptions;
         _threadingContext = threadingContext;
         _eventQueue = new AsyncBatchingWorkQueue<WorkspaceChangeEventArgs>(
             DelayTimeSpan.Short,
@@ -44,14 +44,11 @@ public HostLegacySolutionEventsWorkspaceEventListener(
 
     public void StartListening(Workspace workspace, object? serviceOpt)
     {
-        if (_globalOptions.GetOption(SolutionCrawlerRegistrationService.EnableSolutionCrawler))
+        workspace.WorkspaceChanged += OnWorkspaceChanged;
+        _threadingContext.DisposalToken.Register(() =>
         {
-            workspace.WorkspaceChanged += OnWorkspaceChanged;
-            _threadingContext.DisposalToken.Register(() =>
-            {
-                workspace.WorkspaceChanged -= OnWorkspaceChanged;
-            });
-        }
+            workspace.WorkspaceChanged -= OnWorkspaceChanged;
+        });
     }
 
     private void OnWorkspaceChanged(object? sender, WorkspaceChangeEventArgs e)

src/EditorFeatures/Test/CodeFixes/CodeFixServiceTests.cs

@@ -59,11 +59,6 @@ public async Task TestGetFirstDiagnosticWithFixAsync()
             var fixService = new CodeFixService(
                 diagnosticService, logger, fixers, SpecializedCollections.EmptyEnumerable<Lazy<IConfigurationFixProvider, CodeChangeProviderMetadata>>());
 
-            var incrementalAnalyzer = (IIncrementalAnalyzerProvider)diagnosticService;
-
-            // register diagnostic engine to solution crawler
-            var analyzer = incrementalAnalyzer.CreateIncrementalAnalyzer(workspace);
-
             var reference = new MockAnalyzerReference();
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
             var document = project.Documents.Single();
@@ -302,8 +297,6 @@ private static async Task<ImmutableArray<CodeFixCollection>> GetAddedFixesAsync(
             errorReportingService.OnError = message => errorReported = true;
 
             GetDocumentAndExtensionManager(tuple.analyzerService, workspace, out var document, out var extensionManager);
-            var incrementalAnalyzer = (IIncrementalAnalyzerProvider)tuple.analyzerService;
-            var analyzer = incrementalAnalyzer.CreateIncrementalAnalyzer(workspace);
             var reference = new MockAnalyzerReference(codefix, ImmutableArray.Create(diagnosticAnalyzer));
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
             document = project.Documents.Single();
@@ -408,10 +401,8 @@ private static void GetDocumentAndExtensionManager(
             MockAnalyzerReference? analyzerReference = null,
             TextDocumentKind documentKind = TextDocumentKind.Document)
         {
-            var incrementalAnalyzer = (IIncrementalAnalyzerProvider)diagnosticService;
-
             // register diagnostic engine to solution crawler
-            diagnosticIncrementalAnalyzer = (DiagnosticIncrementalAnalyzer)incrementalAnalyzer.CreateIncrementalAnalyzer(workspace)!;
+            diagnosticIncrementalAnalyzer = diagnosticService.CreateIncrementalAnalyzer(workspace)!;
 
             var reference = analyzerReference ?? new MockAnalyzerReference();
             var project = workspace.CurrentSolution.Projects.Single().AddAnalyzerReference(reference);
@@ -794,11 +785,6 @@ private static async Task<ImmutableArray<CodeFixCollection>> GetNuGetAndVsixCode
             var fixService = new CodeFixService(
                 diagnosticService, logger, vsixFixers, SpecializedCollections.EmptyEnumerable<Lazy<IConfigurationFixProvider, CodeChangeProviderMetadata>>());
 
-            var incrementalAnalyzer = (IIncrementalAnalyzerProvider)diagnosticService;
-
-            // register diagnostic engine to solution crawler
-            var analyzer = incrementalAnalyzer.CreateIncrementalAnalyzer(workspace);
-
             diagnosticAnalyzer ??= new MockAnalyzerReference.MockDiagnosticAnalyzer();
             var analyzers = ImmutableArray.Create<DiagnosticAnalyzer>(diagnosticAnalyzer);
             var reference = new MockAnalyzerReference(nugetFixer, analyzers);
@@ -1022,7 +1008,6 @@ public AdditionalFileFixerWithoutDocumentKindsAndExtensions() : base(nameof(Addi
         [Theory, CombinatorialData]
         public async Task TestGetFixesWithDeprioritizedAnalyzerAsync(
             DeprioritizedAnalyzer.ActionKind actionKind,
-            bool testWithCachedDiagnostics,
             bool diagnosticOnFixLineInPriorSnapshot,
             bool editOnFixLine,
             bool addNewLineWithEdit)
@@ -1042,7 +1027,7 @@ public async Task TestGetFixesWithDeprioritizedAnalyzerAsync(
             //     of the heuristic where we compare intersecting diagnostics across document snapshots only if both
             //     snapshots have the same number of lines.
 
-            var expectDeprioritization = GetExpectDeprioritization(actionKind, testWithCachedDiagnostics, diagnosticOnFixLineInPriorSnapshot, addNewLineWithEdit);
+            var expectDeprioritization = GetExpectDeprioritization(actionKind, diagnosticOnFixLineInPriorSnapshot, addNewLineWithEdit);
 
             var priorSnapshotFixLine = diagnosticOnFixLineInPriorSnapshot ? "int x1 = 0;" : "System.Console.WriteLine();";
             var code = $@"
@@ -1073,7 +1058,8 @@ void M()
             // Trigger background analysis to ensure analyzer diagnostics are computed and cached. 
             // We enable full solution analysis so the 'AnalyzeDocumentAsync' doesn't skip analysis based on whether the document is active/open.
             workspace.GlobalOptions.SetGlobalOption(SolutionCrawlerOptionsStorage.BackgroundAnalysisScopeOption, LanguageNames.CSharp, BackgroundAnalysisScope.FullSolution);
-            await diagnosticIncrementalAnalyzer.AnalyzeDocumentAsync(sourceDocument, bodyOpt: null!, InvocationReasons.DocumentChanged, CancellationToken.None);
+
+            await diagnosticIncrementalAnalyzer.ForceAnalyzeProjectAsync(sourceDocument.Project, CancellationToken.None);
             await VerifyCachedDiagnosticsAsync(sourceDocument, expectedCachedDiagnostic: diagnosticOnFixLineInPriorSnapshot, testSpan, diagnosticIncrementalAnalyzer);
 
             // Compute and apply code edit
@@ -1103,12 +1089,9 @@ void M()
                 ? root.DescendantNodes().OfType<CodeAnalysis.CSharp.Syntax.VariableDeclarationSyntax>().First().Span
                 : root.DescendantNodes().OfType<CodeAnalysis.CSharp.Syntax.InvocationExpressionSyntax>().First().Span;
 
-            if (testWithCachedDiagnostics)
-            {
-                // Trigger background analysis to ensure analyzer diagnostics are computed and cached. 
-                await diagnosticIncrementalAnalyzer.AnalyzeDocumentAsync(sourceDocument, bodyOpt: null!, InvocationReasons.DocumentChanged, CancellationToken.None);
-                await VerifyCachedDiagnosticsAsync(sourceDocument, expectedCachedDiagnostic: !expectedNoFixes, testSpan, diagnosticIncrementalAnalyzer);
-            }
+            await diagnosticIncrementalAnalyzer.GetDiagnosticsAsync(
+                sourceDocument.Project.Solution, sourceDocument.Project.Id, sourceDocument.Id, includeSuppressedDiagnostics: true, includeNonLocalDocumentDiagnostics: true, CancellationToken.None);
+            await diagnosticIncrementalAnalyzer.GetTestAccessor().TextDocumentOpenAsync(sourceDocument);
 
             var lowPriorityAnalyzers = new ConcurrentSet<DiagnosticAnalyzer>();
             var priorityProvider = new SuggestedActionPriorityProvider(CodeActionRequestPriority.Default, lowPriorityAnalyzers);
@@ -1144,31 +1127,25 @@ void M()
 
             static bool GetExpectDeprioritization(
                 DeprioritizedAnalyzer.ActionKind actionKind,
-                bool testWithCachedDiagnostics,
                 bool diagnosticOnFixLineInPriorSnapshot,
                 bool addNewLineWithEdit)
             {
                 // We expect de-prioritization of analyzer from 'Normal' to 'Low' bucket only if following conditions are met:
-                //  1. There are no cached diagnostics from background analysis, i.e. 'testWithCachedDiagnostics == false'.
-                //  2. We have an expensive analyzer that registers SymbolStart/End or SemanticModel actions, both of which have a broad analysis scope.
-                //  3. Either of the below is true:
+                //  1. We have an expensive analyzer that registers SymbolStart/End or SemanticModel actions, both of which have a broad analysis scope.
+                //  2. Either of the below is true:
                 //     a. We do not have an analyzer diagnostic reported in the prior document snapshot on the edited line OR
                 //     b. Number of lines in the prior document snapshot differs from number of lines in the current document snapshot,
                 //        i.e. we added a new line with the edit and 'addNewLineWithEdit = true'.
 
                 // Condition 1
-                if (testWithCachedDiagnostics)
-                    return false;
-
-                // Condition 2
                 if (actionKind is not (DeprioritizedAnalyzer.ActionKind.SymbolStartEnd or DeprioritizedAnalyzer.ActionKind.SemanticModel))
                     return false;
 
-                // Condition 3(a)
+                // Condition 2(a)
                 if (!diagnosticOnFixLineInPriorSnapshot)
                     return true;
 
-                // Condition 3(b)
+                // Condition 2(b)
                 return addNewLineWithEdit;
             }