Revert "Move tracking of builds to unit-test solution crawler code (dotnet#78905)"

This reverts commit 438638e, reversing
changes made to 5e2e54a.

Author: 333fred

src/EditorFeatures/Core/Remote/SolutionChecksumUpdater.cs

@@ -3,10 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.CodeAnalysis.Telemetry;
@@ -22,6 +24,12 @@ internal sealed class SolutionChecksumUpdater
 {
     private readonly Workspace _workspace;
 
+    /// <summary>
+    /// We're not at a layer where we are guaranteed to have an IGlobalOperationNotificationService.  So allow for
+    /// it being null.
+    /// </summary>
+    private readonly IGlobalOperationNotificationService? _globalOperationService;
+
     private readonly IDocumentTrackingService _documentTrackingService;
 
     /// <summary>
@@ -45,13 +53,17 @@ internal sealed class SolutionChecksumUpdater
     private const string SynchronizeTextChangesStatusSucceededKeyName = nameof(SolutionChecksumUpdater) + "." + SynchronizeTextChangesStatusSucceededMetricName;
     private const string SynchronizeTextChangesStatusFailedKeyName = nameof(SolutionChecksumUpdater) + "." + SynchronizeTextChangesStatusFailedMetricName;
 
+    private bool _isSynchronizeWorkspacePaused;
+
     public SolutionChecksumUpdater(
         Workspace workspace,
         IAsynchronousOperationListenerProvider listenerProvider,
         CancellationToken shutdownToken)
     {
         var listener = listenerProvider.GetListener(FeatureAttribute.SolutionChecksumUpdater);
 
+        _globalOperationService = workspace.Services.SolutionServices.ExportProvider.GetExports<IGlobalOperationNotificationService>().FirstOrDefault()?.Value;
+
         _workspace = workspace;
         _documentTrackingService = workspace.Services.GetRequiredService<IDocumentTrackingService>();
 
@@ -74,6 +86,12 @@ public SolutionChecksumUpdater(
         _workspaceChangedImmediateDisposer = _workspace.RegisterWorkspaceChangedImmediateHandler(OnWorkspaceChangedImmediate);
         _documentTrackingService.ActiveDocumentChanged += OnActiveDocumentChanged;
 
+        if (_globalOperationService != null)
+        {
+            _globalOperationService.Started += OnGlobalOperationStarted;
+            _globalOperationService.Stopped += OnGlobalOperationStopped;
+        }
+
         // Enqueue the work to sync the initial data over.
         _synchronizeActiveDocumentQueue.AddWork();
         _synchronizeWorkspaceQueue.AddWork();
@@ -82,21 +100,53 @@ public SolutionChecksumUpdater(
     public void Shutdown()
     {
         // Try to stop any work that is in progress.
+        PauseSynchronizingPrimaryWorkspace();
+
+        _documentTrackingService.ActiveDocumentChanged -= OnActiveDocumentChanged;
+        _workspaceChangedDisposer.Dispose();
+        _workspaceChangedImmediateDisposer.Dispose();
+
+        if (_globalOperationService != null)
+        {
+            _globalOperationService.Started -= OnGlobalOperationStarted;
+            _globalOperationService.Stopped -= OnGlobalOperationStopped;
+        }
+    }
+
+    private void OnGlobalOperationStarted(object? sender, EventArgs e)
+        => PauseSynchronizingPrimaryWorkspace();
+
+    private void OnGlobalOperationStopped(object? sender, EventArgs e)
+        => ResumeSynchronizingPrimaryWorkspace();
+
+    private void PauseSynchronizingPrimaryWorkspace()
+    {
+        // An expensive global operation started (like a build).  Pause ourselves and cancel any outstanding work in
+        // progress to synchronize the solution.
         lock (_gate)
         {
             _synchronizeWorkspaceQueue.CancelExistingWork();
+            _isSynchronizeWorkspacePaused = true;
         }
+    }
 
-        _documentTrackingService.ActiveDocumentChanged -= OnActiveDocumentChanged;
-        _workspaceChangedDisposer.Dispose();
-        _workspaceChangedImmediateDisposer.Dispose();
+    private void ResumeSynchronizingPrimaryWorkspace()
+    {
+        lock (_gate)
+        {
+            _isSynchronizeWorkspacePaused = false;
+            _synchronizeWorkspaceQueue.AddWork();
+        }
     }
 
     private void OnWorkspaceChanged(WorkspaceChangeEventArgs _)
     {
+        // Check if we're currently paused.  If so ignore this notification.  We don't want to any work in response
+        // to whatever the workspace is doing.
         lock (_gate)
         {
-            _synchronizeWorkspaceQueue.AddWork();
+            if (!_isSynchronizeWorkspacePaused)
+                _synchronizeWorkspaceQueue.AddWork();
         }
     }
 

src/EditorFeatures/TestUtilities/EditorTestCompositions.cs

@@ -7,6 +7,7 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.Notification;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.Test.Utilities.Notification;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.CodeAnalysis.UnitTests.Fakes;
 using Microsoft.CodeAnalysis.UnitTests.Remote;
@@ -56,6 +57,7 @@ public static class EditorTestCompositions
             typeof(TestObscuringTipManager));         // TODO: https://devdiv.visualstudio.com/DevDiv/_workitems?id=544569
 
     public static readonly TestComposition EditorFeatures = FeaturesTestCompositions.Features
+        .AddParts(typeof(TestGlobalOperationNotificationService))
         .Add(Editor)
         .AddAssemblies(
             typeof(TextEditorResources).Assembly,

src/EditorFeatures/TestUtilities/Notification/TestGlobalOperationNotificationService.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Composition;
+using System.Threading;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Notification;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.VisualStudio.Composition;
+
+namespace Microsoft.CodeAnalysis.Test.Utilities.Notification;
+
+[Export(typeof(IGlobalOperationNotificationService)), PartNotDiscoverable, Shared]
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal sealed class TestGlobalOperationNotificationService(
+    IAsynchronousOperationListenerProvider listenerProvider)
+    : AbstractGlobalOperationNotificationService(listenerProvider, CancellationToken.None);

src/Features/Core/Portable/ExternalAccess/UnitTesting/SolutionCrawler/UnitTestingGlobalOperationAwareIdleProcessor.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Threading;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.SolutionCrawler;

src/Features/Core/Portable/ExternalAccess/UnitTesting/SolutionCrawler/UnitTestingWorkCoordinator.AbstractUnitTestingPriorityProcessor.cs

@@ -6,8 +6,8 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
 using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.SolutionCrawler;

src/Features/Core/Portable/ExternalAccess/UnitTesting/SolutionCrawler/UnitTestingWorkCoordinator.UnitTestingIncrementalAnalyzerProcessor.cs

@@ -10,10 +10,10 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.LanguageService;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Roslyn.Utilities;

src/Features/Core/Portable/ExternalAccess/UnitTesting/SolutionCrawler/UnitTestingWorkCoordinator.UnitTestingLowPriorityProcessor.cs

@@ -8,8 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ErrorReporting;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
 using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
 namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.SolutionCrawler;

src/Features/Core/Portable/ExternalAccess/UnitTesting/SolutionCrawler/UnitTestingWorkCoordinator.UnitTestingNormalPriorityProcessor.cs

@@ -10,11 +10,11 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Internal.Log;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Roslyn.Utilities;
 using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
 
 #if DEBUG
 using System.Diagnostics;

src/VisualStudio/Core/Def/ExternalAccess/UnitTesting/VisualStudioGlobalOperationNotificationService.cs renamed to src/VisualStudio/Core/Def/Notification/VisualStudioGlobalOperationNotificationService.cs

@@ -5,11 +5,11 @@
 using System;
 using System.Composition;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 
-namespace Microsoft.VisualStudio.LanguageServices.ExternalAccess.UnitTesting;
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.Notification;
 
 [Export(typeof(IGlobalOperationNotificationService)), Shared]
 [method: ImportingConstructor]

src/VisualStudio/Core/Def/RoslynPackage.cs

@@ -14,11 +14,10 @@
 using Microsoft.CodeAnalysis.Editor.Implementation.IntelliSense.AsyncCompletion;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.ErrorReporting;
-using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Notification;
+using Microsoft.CodeAnalysis.Notification;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Remote.ProjectSystem;
 using Microsoft.VisualStudio.LanguageServices.EditorConfigSettings;
-using Microsoft.VisualStudio.LanguageServices.ExternalAccess.UnitTesting;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Diagnostics;
 using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService;
 using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem.RuleSets;
@@ -216,8 +215,11 @@ protected override void Dispose(bool disposing)
 
         ReportSessionWideTelemetry();
 
-        _solutionEventMonitor?.Dispose();
-        _solutionEventMonitor = null;
+        if (_solutionEventMonitor != null)
+        {
+            _solutionEventMonitor.Dispose();
+            _solutionEventMonitor = null;
+        }
 
         base.Dispose(disposing);
     }