Fix listener thread listening after the server process was stopped

[lsp-test.git] / src / Language / Haskell / LSP / Test / Session.hs

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 56e206d8bc8d1681cc4b5b3440fdae1a9b1db1c3..9076a8e5e02e9ed819479a7d10c2f3a2d4ffc21a 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -267,7 +267,9 @@ runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro
       serverAndListenerFinalizer tid = do
         finally (timeout (messageTimeout config * 1^6)
                          (runSession' exitServer))
-                (cleanupProcess server >> killThread tid)
+                -- Make sure to kill the listener first, before closing
+                -- handles etc via cleanupProcess
+                (killThread tid >> cleanupProcess server)
 
   (result, _) <- bracket serverListenerLauncher
                          serverAndListenerFinalizer