projects
/
lsp-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #76 from jneira/fix-win-hang
[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 4b93e71bb5843c2f99fccf8f93bc5b2ade98dd4a..9e4aa81aa1fc960ccd1cbc48509f44541b9ceb8e 100644
(file)
--- a/
src/Language/Haskell/LSP/Test/Session.hs
+++ b/
src/Language/Haskell/LSP/Test/Session.hs
@@
-71,7
+71,10
@@
import Language.Haskell.LSP.Test.Exceptions
import System.Console.ANSI
import System.Directory
import System.IO
import System.Console.ANSI
import System.Directory
import System.IO
-import System.Process (waitForProcess, ProcessHandle())
+import System.Process (ProcessHandle())
+#ifndef mingw32_HOST_OS
+import System.Process (waitForProcess)
+#endif
import System.Timeout
-- | A session representing one instance of launching and connecting to a server.
import System.Timeout
-- | A session representing one instance of launching and connecting to a server.
@@
-271,7
+274,10
@@
runSessionWithHandles serverIn serverOut serverProc serverHandler config caps ro
-- handles etc via cleanupProcess
killThread tid
-- Give the server some time to exit cleanly
-- handles etc via cleanupProcess
killThread tid
-- 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 serverProc)
timeout msgTimeoutMs (waitForProcess serverProc)
+#endif
cleanupProcess server
(result, _) <- bracket serverListenerLauncher
cleanupProcess server
(result, _) <- bracket serverListenerLauncher