Skip to content

Fix LSP client dispose bug in tests #1212

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

Merged
merged 1 commit into from
Feb 28, 2020
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
16 changes: 12 additions & 4 deletions test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
Expand Down Expand Up @@ -48,9 +49,16 @@ public async override Task CustomInitializeAsync(

public override async Task DisposeAsync()
{
await LanguageClient.Shutdown();
await _psesProcess.Stop();
LanguageClient?.Dispose();
try
{
await LanguageClient.Shutdown();
await _psesProcess.Stop();
LanguageClient?.Dispose();
}
catch (ObjectDisposedException)
{
// Language client has a disposal bug in it
}
}
}
}