Merge pull request #67196 from CyrusNajmabadi/expeditableDelay

Move to an expeditable delay to help out tests.
dotnet · Mar 6, 2023 · 42708be · 42708be
2 parents 5f38bc8 + da06caa
commit 42708be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Features/Core/Portable/DesignerAttribute/DesignerAttributeDiscoveryService.cs b/src/Features/Core/Portable/DesignerAttribute/DesignerAttributeDiscoveryService.cs
@@ -16,6 +16,7 @@
 using Microsoft.CodeAnalysis.LanguageService;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.DesignerAttribute
@@ -30,6 +31,8 @@ internal sealed partial class DesignerAttributeDiscoveryService : IDesignerAttri
         /// </summary>
         private static readonly ConditionalWeakTable<IReadOnlyList<MetadataReference>, AsyncLazy<bool>> s_metadataReferencesToDesignerAttributeInfo = new();
 
+        private readonly IAsynchronousOperationListener _listener;
+
         /// <summary>
         /// Protects mutable state in this type.
         /// </summary>
@@ -43,8 +46,9 @@ internal sealed partial class DesignerAttributeDiscoveryService : IDesignerAttri
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-        public DesignerAttributeDiscoveryService()
+        public DesignerAttributeDiscoveryService(IAsynchronousOperationListenerProvider listenerProvider)
         {
+            _listener = listenerProvider.GetListener(FeatureAttribute.DesignerAttributes);
         }
 
         private static AsyncLazy<bool> GetLazyHasDesignerCategoryType(Project project)
@@ -79,7 +83,7 @@ public async ValueTask ProcessSolutionAsync(
                     await ProcessProjectAsync(priorityDocument.Project, priorityDocument, useFrozenSnapshots, callback, cancellationToken).ConfigureAwait(false);
 
                 // Wait a little after the priority document and process the rest at a lower priority.
-                await Task.Delay(DelayTimeSpan.NonFocus, cancellationToken).ConfigureAwait(false);
+                await _listener.Delay(DelayTimeSpan.NonFocus, cancellationToken).ConfigureAwait(false);
 
                 // Process the rest of the projects in dependency order so that their data is ready when we hit the 
                 // projects that depend on them.

diff --git a/...orkspaces/SharedUtilitiesAndExtensions/Compiler/Core/TestHooks/IExpeditableDelaySource.cs b/...orkspaces/SharedUtilitiesAndExtensions/Compiler/Core/TestHooks/IExpeditableDelaySource.cs
@@ -24,7 +24,7 @@ internal interface IExpeditableDelaySource
         /// <para>The <paramref name="delay"/> argument's <see cref="TimeSpan.TotalMilliseconds"/> property is greater than <see cref="int.MaxValue"/>.</para>
         /// </exception>
         /// <exception cref="OperationCanceledException">The delay has been canceled.</exception>
-        [SuppressMessage("Style", "VSTHRD200:Use \"Async\" suffix for async methods", Justification = "Named after 'Task.Delay'")]
+        [SuppressMessage("Style", """VSTHRD200:Use "Async" suffix for async methods""", Justification = "Named after 'Task.Delay'")]
         Task<bool> Delay(TimeSpan delay, CancellationToken cancellationToken);
     }
 }