X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FSession.hs;h=bbfdf386ac167bd0f8ab5b9a277b754920aacf57;hp=f85eed92cfef9ead64e32007c5422188787f63a6;hb=b9125dab0726c05597d9dd372e12f779906c5b5b;hpb=1c033091f83bd159d4cda2b495e8619a7508dcbc diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs index f85eed9..bbfdf38 100644 --- a/src/Language/Haskell/LSP/Test/Session.hs +++ b/src/Language/Haskell/LSP/Test/Session.hs @@ -60,12 +60,13 @@ import Language.Haskell.LSP.Types.Capabilities import Language.Haskell.LSP.Types import Language.Haskell.LSP.Types.Lens hiding (error) import Language.Haskell.LSP.VFS +import Language.Haskell.LSP.Test.Compat import Language.Haskell.LSP.Test.Decoding import Language.Haskell.LSP.Test.Exceptions import System.Console.ANSI import System.Directory import System.IO -import System.Process +import System.Process (ProcessHandle()) import System.Timeout -- | A session representing one instance of launching and connecting to a server. @@ -222,9 +223,7 @@ runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro server = (Just serverIn, Just serverOut, Nothing, serverProc) serverFinalizer tid = finally (timeout (messageTimeout config * 1000000) (runSession' exitServer)) - (terminateProcess serverProc - >> hClose serverOut - >> killThread tid) + (cleanupRunningProcess server >> killThread tid) (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session) return result