From: jneira Date: Tue, 16 Jul 2019 11:16:05 +0000 (+0200) Subject: Replace cleanupServer with functions avalilable in ghc <= 8.4 X-Git-Tag: 0.6.1.0~2^2~8^2~1 X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=1c033091f83bd159d4cda2b495e8619a7508dcbc Replace cleanupServer with functions avalilable in ghc <= 8.4 --- diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs index 8612148..f85eed9 100644 --- a/src/Language/Haskell/LSP/Test/Session.hs +++ b/src/Language/Haskell/LSP/Test/Session.hs @@ -222,7 +222,9 @@ runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro server = (Just serverIn, Just serverOut, Nothing, serverProc) serverFinalizer tid = finally (timeout (messageTimeout config * 1000000) (runSession' exitServer)) - (cleanupProcess server >> killThread tid) + (terminateProcess serverProc + >> hClose serverOut + >> killThread tid) (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session) return result