If we wait for html documents, it works for cohosting and non

Author: davidwengier

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Test.Common;
-using Microsoft.VisualStudio.Extensibility.Testing;
+using Microsoft.VisualStudio.Extensibility.Testing; 
 using Xunit;
 using Xunit.Sdk;
 using Task = System.Threading.Tasks.Task;

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/BreakpointSpanTests.cs

@@ -18,7 +18,7 @@ public async Task SetBreakpoint_FirstCharacter_SpanAdjusts()
         // Wait for classifications to indicate Razor LSP is up and running
         await TestServices.Editor.WaitForComponentClassificationAsync(ControlledHangMitigatingCancellationToken);
 
-        await TestServices.RazorProjectSystem.WaitForCSharpVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
+        await TestServices.RazorProjectSystem.WaitForHtmlVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
         {
             await TestServices.Editor.SetTextAsync("<p>@{ var abc = 123; }</p>", ControlledHangMitigatingCancellationToken);
         }, ControlledHangMitigatingCancellationToken);
@@ -37,7 +37,7 @@ public async Task SetBreakpoint_FirstCharacter_InvalidLine()
         // Wait for classifications to indicate Razor LSP is up and running
         await TestServices.Editor.WaitForComponentClassificationAsync(ControlledHangMitigatingCancellationToken);
 
-        await TestServices.RazorProjectSystem.WaitForCSharpVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
+        await TestServices.RazorProjectSystem.WaitForHtmlVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
         {
             await TestServices.Editor.SetTextAsync("""
                 <p>@{
@@ -58,7 +58,7 @@ public async Task SetBreakpoint_FirstCharacter_ValidLine()
         // Wait for classifications to indicate Razor LSP is up and running
         await TestServices.Editor.WaitForComponentClassificationAsync(ControlledHangMitigatingCancellationToken);
 
-        await TestServices.RazorProjectSystem.WaitForCSharpVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
+        await TestServices.RazorProjectSystem.WaitForHtmlVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, RazorProjectConstants.CounterRazorFile, async () =>
         {
             await TestServices.Editor.SetTextAsync("""
                 <p>@{

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/CompletionIntegrationTests.cs

@@ -615,7 +615,12 @@ await TestServices.SolutionExplorer.AddFileAsync(
         await TestServices.Editor.PlaceCaretAsync(search, charsOffset: 1, ControlledHangMitigatingCancellationToken);
         foreach (var stringToType in stringsToType)
         {
-            TestServices.Input.Send(stringToType);
+            await TestServices.RazorProjectSystem.WaitForHtmlVirtualDocumentUpdateAsync(RazorProjectConstants.BlazorProjectName, "Test.razor", () =>
+            {
+                TestServices.Input.Send(stringToType);
+
+                return Task.CompletedTask;
+            }, ControlledHangMitigatingCancellationToken);
         }
 
         if (expectedSelectedItemLabel is not null)

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/RazorProjectSystemInProcess.cs

@@ -38,11 +38,6 @@ public async Task WaitForLSPServerDeactivatedAsync(CancellationToken cancellatio
 
     private async Task WaitForLSPServerActivationStatusAsync(bool active, CancellationToken cancellationToken)
     {
-        if (await IsCohostingActiveAsync(cancellationToken))
-        {
-            return;
-        }
-
         var tracker = await TestServices.Shell.GetComponentModelServiceAsync<ILspServerActivationTracker>(cancellationToken);
         await Helper.RetryAsync(ct =>
         {
@@ -126,25 +121,19 @@ public async Task<ImmutableArray<string>> GetProjectKeyIdsForProjectAsync(string
         return projectManager.GetProjectKeysWithFilePath(projectFilePath).SelectAsArray(static key => key.Id);
     }
 
-    public async Task WaitForCSharpVirtualDocumentAsync(string razorFilePath, CancellationToken cancellationToken)
+    public async Task WaitForHtmlVirtualDocumentAsync(string razorFilePath, CancellationToken cancellationToken)
     {
-        if (await IsCohostingActiveAsync(cancellationToken))
-        {
-            return;
-        }
-
         var documentManager = await TestServices.Shell.GetComponentModelServiceAsync<LSPDocumentManager>(cancellationToken);
 
         var uri = new Uri(razorFilePath, UriKind.Absolute);
         await Helper.RetryAsync(ct =>
         {
             if (documentManager.TryGetDocument(uri, out var snapshot))
             {
-                if (snapshot.TryGetVirtualDocument<CSharpVirtualDocumentSnapshot>(out var virtualDocument))
+                if (snapshot.TryGetVirtualDocument<HtmlVirtualDocumentSnapshot>(out var virtualDocument))
                 {
-                    var result = !virtualDocument.ProjectKey.IsUnknown &&
-                        virtualDocument.Snapshot.Length > 0;
-                    return Task.FromResult(result);
+                    //var result = virtualDocument.Snapshot.Length > 0;
+                    return Task.FromResult(true);
                 }
             }
 
@@ -153,15 +142,8 @@ await Helper.RetryAsync(ct =>
         }, TimeSpan.FromMilliseconds(100), cancellationToken);
     }
 
-    public async Task WaitForCSharpVirtualDocumentUpdateAsync(string projectName, string relativeFilePath, Func<Task> updater, CancellationToken cancellationToken)
+    public async Task WaitForHtmlVirtualDocumentUpdateAsync(string projectName, string relativeFilePath, Func<Task> updater, CancellationToken cancellationToken)
     {
-        if (await IsCohostingActiveAsync(cancellationToken))
-        {
-            // In cohosting we don't wait for anything, we just update the Razor doc and assume that Roslyn will do the right things
-            await updater();
-            return;
-        }
-
         var filePath = await TestServices.SolutionExplorer.GetAbsolutePathForProjectRelativeFilePathAsync(projectName, relativeFilePath, cancellationToken);
 
         var documentManager = await TestServices.Shell.GetComponentModelServiceAsync<LSPDocumentManager>(cancellationToken);
@@ -174,10 +156,9 @@ await Helper.RetryAsync(async ct =>
         {
             if (documentManager.TryGetDocument(uri, out var snapshot))
             {
-                if (snapshot.TryGetVirtualDocument<CSharpVirtualDocumentSnapshot>(out var virtualDocument))
+                if (snapshot.TryGetVirtualDocument<HtmlVirtualDocumentSnapshot>(out var virtualDocument))
                 {
-                    if (!virtualDocument.ProjectKey.IsUnknown &&
-                        virtualDocument.Snapshot.Length > 0)
+                    if (virtualDocument.Snapshot.Length > 0)
                     {
                         if (desiredVersion is null)
                         {

src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs

@@ -134,7 +134,7 @@ public async Task OpenFileAsync(string projectName, string relativeFilePath, Can
         var fileExtension = Path.GetExtension(filePath);
         if (fileExtension.Equals(".razor", StringComparison.OrdinalIgnoreCase) || fileExtension.Equals(".cshtml", StringComparison.OrdinalIgnoreCase))
         {
-            await TestServices.RazorProjectSystem.WaitForCSharpVirtualDocumentAsync(filePath, cancellationToken);
+            await TestServices.RazorProjectSystem.WaitForHtmlVirtualDocumentAsync(filePath, cancellationToken);
         }
     }