Removing unnecessary lock and boolean field

Author: DustinCampbell

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.TestAccessor.cs

@@ -20,23 +20,15 @@ public bool IsWaitingToClearClosedDocuments
         {
             get
             {
-                lock (instance._documentClosedGate)
-                {
-                    return instance._waitingToClearClosedDocuments;
-                }
+                return !instance._clearClosedDocumentsTask.IsCompleted;
             }
         }
 
-        public async Task WaitForClearClosedDocumentsAsync()
+        public Task WaitForClearClosedDocumentsAsync()
         {
-            Task task;
-
-            lock (instance._documentClosedGate)
-            {
-                task = instance._clearClosedDocumentsTask;
-            }
-
-            await task.ConfigureAwait(false);
+#pragma warning disable VSTHRD003 // Avoid awaiting foreign Tasks
+            return instance._clearClosedDocumentsTask;
+#pragma warning restore VSTHRD003 // Avoid awaiting foreign Tasks
         }
 
         public Task WaitForDiagnosticsToPublishAsync()

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.cs

@@ -43,9 +43,7 @@ private readonly record struct PublishedDiagnostics(IReadOnlyList<RazorDiagnosti
     private readonly AsyncBatchingWorkQueue<IDocumentSnapshot> _workQueue;
     private readonly Dictionary<string, PublishedDiagnostics> _publishedDiagnostics;
 
-    private readonly object _documentClosedGate = new();
     private Task _clearClosedDocumentsTask = Task.CompletedTask;
-    private bool _waitingToClearClosedDocuments;
 
     public RazorDiagnosticsPublisher(
         IProjectSnapshotManager projectManager,
@@ -204,27 +202,18 @@ .. csharpDiagnostics ?? []
 
     private void StartDelayToClearDocuments()
     {
-        lock (_documentClosedGate)
+        if (!_clearClosedDocumentsTask.IsCompleted)
         {
-            if (_waitingToClearClosedDocuments)
-            {
-                return;
-            }
-
-            _clearClosedDocumentsTask = ClearClosedDocumentsAfterDelayAsync();
-            _waitingToClearClosedDocuments = true;
+            return;
         }
 
+        _clearClosedDocumentsTask = ClearClosedDocumentsAfterDelayAsync();
+
         async Task ClearClosedDocumentsAfterDelayAsync()
         {
             await Task.Delay(s_clearClosedDocumentsDelay, _disposeTokenSource.Token).ConfigureAwait(false);
 
             ClearClosedDocuments();
-
-            lock (_documentClosedGate)
-            {
-                _waitingToClearClosedDocuments = false;
-            }
         }
     }