Merge pull request #4110 from davidwengier/Perf

Reduce work during solution close

Author: davidwengier

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectSnapshotManagerBenchmarkBase.cs

@@ -1,11 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/BackgroundDocumentGenerator.cs

@@ -17,6 +17,7 @@ internal class BackgroundDocumentGenerator : ProjectSnapshotChangeTrigger
         private readonly Dictionary<string, DocumentSnapshot> _work;
         private ProjectSnapshotManagerBase _projectManager;
         private Timer _timer;
+        private bool _solutionIsClosing;
 
         public BackgroundDocumentGenerator(
             ProjectSnapshotManagerDispatcher projectSnapshotManagerDispatcher,
@@ -176,6 +177,11 @@ private async void Timer_Tick(object state)
 
                 for (var i = 0; i < work.Length; i++)
                 {
+                    if (_solutionIsClosing)
+                    {
+                        break;
+                    }
+
                     var document = work[i].Value;
                     try
                     {
@@ -189,9 +195,12 @@ private async void Timer_Tick(object state)
 
                 OnCompletingBackgroundWork();
 
-                await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
-                    () => NotifyDocumentsProcessed(work),
-                    CancellationToken.None);
+                if (!_solutionIsClosing)
+                {
+                    await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
+                        () => NotifyDocumentsProcessed(work),
+                        CancellationToken.None);
+                }
 
                 lock (_work)
                 {
@@ -200,7 +209,7 @@ await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
                     _timer = null;
 
                     // If more work came in while we were running start the worker again.
-                    if (_work.Count > 0)
+                    if (_work.Count > 0 && !_solutionIsClosing)
                     {
                         StartWorker();
                     }
@@ -232,6 +241,14 @@ private void NotifyDocumentsProcessed(KeyValuePair<string, DocumentSnapshot>[] w
 
         private void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                _solutionIsClosing = true;
+                return;
+            }
+            _solutionIsClosing = false;
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             switch (args.Kind)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs

@@ -101,6 +101,12 @@ public override void Initialize(ProjectSnapshotManagerBase projectManager)
 
         private void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                return;
+            }
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             switch (args.Kind)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedDocumentContainerStore.cs

@@ -66,6 +66,12 @@ public override void Initialize(ProjectSnapshotManagerBase projectManager)
         // Internal for testing
         internal void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                return;
+            }
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             switch (args.Kind)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedDocumentPublisher.cs

@@ -167,6 +167,12 @@ public override void PublishHtml(string filePath, SourceText sourceText, int hos
 
         private void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                return;
+            }
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             switch (args.Kind)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.cs

@@ -18,6 +18,7 @@ internal class OpenDocumentGenerator : ProjectSnapshotChangeTrigger
         private readonly Dictionary<string, DocumentSnapshot> _work;
         private ProjectSnapshotManagerBase _projectManager;
         private Timer _timer;
+        private bool _solutionIsClosing;
 
         public OpenDocumentGenerator(
             ProjectSnapshotManagerDispatcher projectSnapshotManagerDispatcher,
@@ -182,6 +183,11 @@ private async void Timer_Tick(object state)
 
                 for (var i = 0; i < work.Length; i++)
                 {
+                    if (_solutionIsClosing)
+                    {
+                        break;
+                    }
+
                     var document = work[i].Value;
                     try
                     {
@@ -195,7 +201,7 @@ private async void Timer_Tick(object state)
 
                 OnCompletingBackgroundWork();
 
-                if (_documentProcessedListeners.Count != 0)
+                if (_documentProcessedListeners.Count != 0 && !_solutionIsClosing)
                 {
                     await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
                         () => NotifyDocumentsProcessed(work),
@@ -209,7 +215,7 @@ await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
                     _timer = null;
 
                     // If more work came in while we were running start the worker again.
-                    if (_work.Count > 0)
+                    if (_work.Count > 0 && !_solutionIsClosing)
                     {
                         StartWorker();
                     }
@@ -241,6 +247,14 @@ private void NotifyDocumentsProcessed(KeyValuePair<string, DocumentSnapshot>[] w
 
         private void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                _solutionIsClosing = true;
+                return;
+            }
+            _solutionIsClosing = false;
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             switch (args.Kind)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectConfigurationStateSynchronizer.cs

@@ -77,7 +77,6 @@ public void ProjectConfigurationFileChanged(ProjectConfigurationFileChangeEventA
                             return;
                         }
 
-
                         EnqueueUpdateProject(handle.FilePath, handle);
                         break;
                     }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorServerReadyPublisher.cs

@@ -50,6 +50,12 @@ public override void Initialize(ProjectSnapshotManagerBase projectManager)
         private async void ProjectSnapshotManager_Changed(object sender, ProjectChangeEventArgs args)
 #pragma warning restore VSTHRD100 // Avoid async void methods
         {
+            // Don't do any work if the solution is closing
+            if (args.SolutionIsClosing)
+            {
+                return;
+            }
+
             _projectSnapshotManagerDispatcher.AssertDispatcherThread();
 
             var projectSnapshot = args.Newer;