Use separate async tracker for SG work instad of reusing workspace async tracker

No need to wait to be fully loaded.  all we're doing is incrementing numbers, not actually running generators

Author: CyrusNajmabadi

src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs

@@ -38,7 +38,7 @@ namespace Roslyn.VisualStudio.Next.UnitTests.Remote
 {
     [UseExportProvider]
     [Trait(Traits.Feature, Traits.Features.RemoteHost)]
-    public class ServiceHubServicesTests
+    public sealed class ServiceHubServicesTests
     {
         private static TestWorkspace CreateWorkspace(Type[] additionalParts = null)
              => new(composition: FeaturesTestCompositions.Features.WithTestHostParts(TestHost.OutOfProcess).AddParts(additionalParts));
@@ -765,10 +765,10 @@ private static DocumentId AddSimpleDocument(TestWorkspace workspace, CallbackGen
             return tempDoc.Id;
         }
 
-        private static IAsynchronousOperationWaiter GetWorkspaceWaiter(TestWorkspace workspace)
+        private static async Task WaitForSourceGeneratorsAsync(TestWorkspace workspace)
         {
             var operations = workspace.ExportProvider.GetExportedValue<AsynchronousOperationListenerProvider>();
-            return operations.GetWaiter(FeatureAttribute.Workspace);
+            await operations.WaitAllAsync(workspace, [FeatureAttribute.Workspace, FeatureAttribute.SourceGenerators]);
         }
 
         [Theory, CombinatorialData]
@@ -810,7 +810,7 @@ internal async Task TestSourceGenerationExecution_MinorVersionChange_NoActualCha
             Assert.Equal(1, callCount);
 
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             solution = workspace.CurrentSolution;
             project = solution.Projects.Single();
@@ -866,7 +866,7 @@ internal async Task TestSourceGenerationExecution_MajorVersionChange_NoActualCha
 
             // Because we're forcing regeneration, in both mode we should now see two calls to the generator.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: true);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             solution = workspace.CurrentSolution;
             project = solution.Projects.Single();
@@ -913,7 +913,7 @@ internal async Task TestSourceGenerationExecution_FullSolutionChange_Minor(Sourc
             var initialSolution = workspace.CurrentSolution;
 
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -964,7 +964,7 @@ internal async Task TestSourceGenerationExecution_FullSolutionChange_Major(Sourc
             var initialSolution = workspace.CurrentSolution;
 
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: true);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1007,7 +1007,7 @@ internal async Task TestSourceGenerationExecution_FullSolutionChange_MajorAndMin
             // forceRegeneration=true should take precedence.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: false);
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: true);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1049,7 +1049,7 @@ internal async Task TestSourceGenerationExecution_ProjectChange_Minor_1(SourceGe
 
             // Updating project1 should only impact it.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1102,7 +1102,7 @@ internal async Task TestSourceGenerationExecution_ProjectChange_Minor_2(SourceGe
 
             // Updating project1 should regen both projects due to p2p reference.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1155,7 +1155,7 @@ internal async Task TestSourceGenerationExecution_ProjectChange_Minor_3(SourceGe
 
             // Updating project2 should regen only it due to project1 having no reference to it.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId2, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1210,7 +1210,7 @@ internal async Task TestSourceGenerationExecution_ProjectChange_MinorAndMajor1(S
             // for both as project2 has a ref on project1.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: true);
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId2, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1255,7 +1255,7 @@ internal async Task TestSourceGenerationExecution_ProjectChange_MinorAndMajor2(S
             // only for project2 as project1 doesn't have a ref on it.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: false);
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId2, forceRegeneration: true);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1298,7 +1298,7 @@ internal async Task TestSourceGenerationExecution_SolutionAndProjectChange_1(Sou
             // Project2 should have a minor update since we only have a solution-minor change.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: false);
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: true);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 
@@ -1341,7 +1341,7 @@ internal async Task TestSourceGenerationExecution_SolutionAndProjectChange_2(Sou
             // Project1 and 2 should have a major update since we have a solution-majorchange.
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: null, forceRegeneration: true);
             workspace.EnqueueUpdateSourceGeneratorVersion(projectId: projectId1, forceRegeneration: false);
-            await GetWorkspaceWaiter(workspace).ExpeditedWaitAsync();
+            await WaitForSourceGeneratorsAsync(workspace);
 
             var currentSolution = workspace.CurrentSolution;
 

src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/IWorkspaceAsynchronousOperationListenerProvider.cs

@@ -12,4 +12,5 @@ namespace Microsoft.CodeAnalysis.Host;
 internal interface IWorkspaceAsynchronousOperationListenerProvider : IWorkspaceService
 {
     IAsynchronousOperationListener GetListener();
+    IAsynchronousOperationListener GetListener(string featureName);
 }

src/Workspaces/Core/Portable/Workspace/Host/TaskScheduler/WorkspaceAsynchronousOperationListenerProvider.cs

@@ -19,4 +19,7 @@ internal sealed class WorkspaceAsynchronousOperationListenerProvider(IAsynchrono
 
     public IAsynchronousOperationListener GetListener()
         => _listener;
+
+    public IAsynchronousOperationListener GetListener(string featureName)
+        => listenerProvider.GetListener(featureName);
 }

src/Workspaces/Core/Portable/Workspace/Workspace.cs

@@ -19,6 +19,7 @@
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Remote;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
@@ -92,7 +93,7 @@ protected Workspace(HostServices host, string? workspaceKind)
             TimeSpan.FromMilliseconds(1500),
             ProcessUpdateSourceGeneratorRequestAsync,
             EqualityComparer<(ProjectId? projectId, bool forceRegeneration)>.Default,
-            listenerProvider.GetListener(),
+            listenerProvider.GetListener(FeatureAttribute.SourceGenerators),
             _updateSourceGeneratorsQueueTokenSource.Token);
     }
 

src/Workspaces/Core/Portable/Workspace/Workspace_SourceGeneration.cs

@@ -43,10 +43,6 @@ private async ValueTask ProcessUpdateSourceGeneratorRequestAsync(
                 return;
         }
 
-        // Ensure we're fully loaded before rerunning generators.
-        var workspaceStatusService = this.Services.GetRequiredService<IWorkspaceStatusService>();
-        await workspaceStatusService.WaitUntilFullyLoadedAsync(cancellationToken).ConfigureAwait(false);
-
         await this.SetCurrentSolutionAsync(
             useAsync: true,
             oldSolution =>