Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix flaky VSTypeScriptHandlerTests #60706

Merged
merged 2 commits into from
Apr 13, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Composition;
using System.IO;
using System.Linq;
using System.ServiceModel.Syndication;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -70,13 +71,16 @@ public async Task TestRoslynTypeScriptHandlerInvoked()
Assert.Empty(response);
}

private Task<TestLspServer> CreateTsTestLspServerAsync(string workspaceXml)
private async Task<TestLspServer> CreateTsTestLspServerAsync(string workspaceXml)
{
var (clientStream, serverStream) = FullDuplexStream.CreatePair();
var testWorkspace = TestWorkspace.Create(workspaceXml, composition: Composition);

// Ensure workspace operations are completed so we don't get unexpected workspace changes while running.
await WaitForWorkspaceOperationsAsync(testWorkspace);
var languageServerTarget = CreateLanguageServer(serverStream, serverStream, testWorkspace);

return TestLspServer.CreateAsync(testWorkspace, new ClientCapabilities(), languageServerTarget, clientStream);
return await TestLspServer.CreateAsync(testWorkspace, new ClientCapabilities(), languageServerTarget, clientStream);
}

private static LanguageServerTarget CreateLanguageServer(Stream inputStream, Stream outputStream, TestWorkspace workspace)
Expand Down