From: Luke Lau Date: Wed, 14 Oct 2020 16:26:54 +0000 (+0100) Subject: Fix dodgy merge X-Git-Tag: 0.13.0.0~7^2~6 X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=1fb2c02419384b450fd43ae281ef410cb7bfb2cf Fix dodgy merge --- diff --git a/src/Language/LSP/Test/Session.hs b/src/Language/LSP/Test/Session.hs index 5839a15..6a6cf15 100644 --- a/src/Language/LSP/Test/Session.hs +++ b/src/Language/LSP/Test/Session.hs @@ -274,7 +274,10 @@ runSession' serverIn serverOut mServerProc serverHandler config caps rootDir exi let cleanup | Just sp <- mServerProc = do -- Give the server some time to exit cleanly + -- It makes the server hangs in windows so we have to avoid it +#ifndef mingw32_HOST_OS timeout msgTimeoutMs (waitForProcess sp) +#endif cleanupProcess (Just serverIn, Just serverOut, Nothing, sp) | otherwise = pure () finally (timeout msgTimeoutMs (runSession' exitServer))