Merge remote-tracking branch 'sharwell/wait-for-compilation' into tes…

…tfix
dotnet · Nov 9, 2023 · 5e7f3b3 · 5e7f3b3
2 parents eba055a + ede124b
commit 5e7f3b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/AbstractEditorTest.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/AbstractEditorTest.cs
@@ -4,7 +4,6 @@
 
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Editor;
 using Microsoft.VisualStudio.IntegrationTest.Utilities;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
@@ -95,6 +94,8 @@ protected async Task SetUpEditorAsync(string markupCode, CancellationToken cance
             {
                 await TestServices.Workspace.SetPrettyListingAsync(LanguageName, originalValue, cancellationToken);
             }
+
+            await TestServices.Workarounds.WaitForCompilationAvailableAsync(cancellationToken);
         }
     }
 }
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/WorkaroundsInProcess.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/InProcess/WorkaroundsInProcess.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Extensibility.Testing;
+using Microsoft.VisualStudio.LanguageServices;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
@@ -17,6 +18,17 @@ namespace Roslyn.VisualStudio.IntegrationTests.InProcess
     [TestService]
     internal partial class WorkaroundsInProcess
     {
+        public async Task WaitForCompilationAvailableAsync(CancellationToken cancellationToken)
+        {
+            await TestServices.Workspace.WaitForAsyncOperationsAsync(FeatureAttribute.Workspace, cancellationToken);
+
+            var workspace = await TestServices.Shell.GetComponentModelServiceAsync<VisualStudioWorkspace>(cancellationToken);
+            foreach (var project in workspace.CurrentSolution.Projects)
+            {
+                await project.GetCompilationAsync(cancellationToken);
+            }
+        }
+
         public async Task WaitForNavigationAsync(CancellationToken cancellationToken)
         {
             await TestServices.Workspace.WaitForAllAsyncOperationsAsync([FeatureAttribute.Workspace, FeatureAttribute.NavigateTo], cancellationToken);