From 4910243251fe138b4771289b6b9ebd9116b7745c Mon Sep 17 00:00:00 2001
From: Rob Holt <roholt@microsoft.com>
Date: Thu, 27 Feb 2020 11:26:14 -0800
Subject: [PATCH] Fix LSP client dispose bug in tests

---
 .../LSPTestsFixures.cs                           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs b/test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs
index 55eea94ef..7121a71e8 100644
--- a/test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs
+++ b/test/PowerShellEditorServices.Test.E2E/LSPTestsFixures.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -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
+            }
         }
     }
 }