X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FSession.hs;h=4d75d1defa541f07993874da444ed8d4cf08d0ff;hb=f14d6c859ce68ec2d73503cbe03e205108df444d;hp=8612148ce870a56b1e3cc1587567607dc60f4955;hpb=1b1df64886e90bb77c2804452945ff0d66963e0a;p=lsp-test.git diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs index 8612148..4d75d1d 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. @@ -197,7 +198,6 @@ runSessionWithHandles :: Handle -- ^ Server in -> Session a -> IO a runSessionWithHandles serverIn serverOut serverProc serverHandler config caps rootDir exitServer session = do - absRootDir <- canonicalizePath rootDir hSetBuffering serverIn NoBuffering @@ -222,7 +222,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)) - (cleanupProcess server >> killThread tid) + (cleanupRunningProcess server >> killThread tid) (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session) return result