X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FCompat.hs;h=f48faa90cc7c40031779a9679b44ddcbf16e41b1;hb=2477907622233c9462d919737955f9ad0d38a3aa;hp=f616331929b7250c9930708652322089c5fc44de;hpb=a4c1143848809be8aed55403dc3187a256dcbe9b;p=lsp-test.git

diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs
index f616331..f48faa9 100644
--- a/src/Language/Haskell/LSP/Test/Compat.hs
+++ b/src/Language/Haskell/LSP/Test/Compat.hs
@@ -6,10 +6,18 @@
 module Language.Haskell.LSP.Test.Compat where
 
 import Data.Maybe
+import System.IO
 
 #if MIN_VERSION_process(1,6,3)
-import System.Process hiding (getPid)
+-- We have to hide cleanupProcess for process-1.6.3.0
+-- cause it is in the public api for 1.6.3.0 versions
+-- shipped with ghc >= 8.6 and < 8.6.4
+import System.Process hiding (getPid, cleanupProcess)
+# if MIN_VERSION_process(1,6,4)
+import qualified System.Process (getPid, cleanupProcess)
+# else
 import qualified System.Process (getPid)
+# endif
 #else
 import System.Process
 import System.Process.Internals
@@ -36,7 +44,11 @@ getProcessID p = fromIntegral . fromJust <$> getProcessID' p
 #if MIN_VERSION_process(1,6,3)
   getProcessID' = System.Process.getPid
 #else
+#if MIN_VERSION_process(1,6,0)
   getProcessID' (ProcessHandle mh _ _) = do
+#else
+  getProcessID' (ProcessHandle mh _) = do
+#endif
     p_ <- readMVar mh
     case p_ of
 #ifdef mingw32_HOST_OS
@@ -48,3 +60,24 @@ getProcessID p = fromIntegral . fromJust <$> getProcessID' p
 #endif
       _ -> return Nothing
 #endif
+
+cleanupRunningProcess :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO ()
+cleanupRunningProcess p@(_, _, _, ph) =
+  getProcessExitCode ph >>= maybe (cleanupProcess p) (const $ return ())
+
+cleanupProcess :: (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle) -> IO ()
+#if MIN_VERSION_process(1,6,4)
+cleanupProcess = System.Process.cleanupProcess
+#else
+cleanupProcess (mb_stdin, mb_stdout, mb_stderr, ph) = do
+
+    terminateProcess ph
+    -- Note, it's important that other threads that might be reading/writing
+    -- these handles also get killed off, since otherwise they might be holding
+    -- the handle lock and prevent us from closing, leading to deadlock.
+    maybe (return ()) hClose mb_stdin
+    maybe (return ()) hClose mb_stdout
+    maybe (return ()) hClose mb_stderr
+
+    return ()
+#endif