X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FCompat.hs;h=f616331929b7250c9930708652322089c5fc44de;hb=a4c1143848809be8aed55403dc3187a256dcbe9b;hp=2372b09eabdb70e20fb25024eb244bc898f134d1;hpb=0f8b9d328f4d950ff0a2e1c3b5aed593b21c2d3a;p=lsp-test.git

diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs
index 2372b09..f616331 100644
--- a/src/Language/Haskell/LSP/Test/Compat.hs
+++ b/src/Language/Haskell/LSP/Test/Compat.hs
@@ -5,31 +5,46 @@
 {-# OPTIONS_GHC -Wunused-imports #-}
 module Language.Haskell.LSP.Test.Compat where
 
-import Control.Concurrent.Chan
-import Control.Monad.IO.Class
-import Data.Conduit
+import Data.Maybe
 
-#ifdef mingw32_HOST_OS
-
-import qualified System.Win32.Process as P (getCurrentProcessId)
-getProcessID :: IO Int
-getProcessID = fromIntegral <$> P.getCurrentProcessId
+#if MIN_VERSION_process(1,6,3)
+import System.Process hiding (getPid)
+import qualified System.Process (getPid)
+#else
+import System.Process
+import System.Process.Internals
+import Control.Concurrent.MVar
+#endif
 
+#ifdef mingw32_HOST_OS
+import qualified System.Win32.Process
 #else
+import qualified System.Posix.Process
+#endif
 
-import qualified System.Posix.Process as P (getProcessID)
-getProcessID :: IO Int
-getProcessID = fromIntegral <$> P.getProcessID
 
+getCurrentProcessID :: IO Int
+#ifdef mingw32_HOST_OS
+getCurrentProcessID = fromIntegral <$> System.Win32.Process.getCurrentProcessId
+#else
+getCurrentProcessID = fromIntegral <$> System.Posix.Process.getProcessID
 #endif
 
-#if MIN_VERSION_conduit(1,3,0)
-chanSource :: MonadIO m => Chan o -> ConduitT i o m b
+getProcessID :: ProcessHandle -> IO Int
+getProcessID p = fromIntegral . fromJust <$> getProcessID' p
+  where
+#if MIN_VERSION_process(1,6,3)
+  getProcessID' = System.Process.getPid
+#else
+  getProcessID' (ProcessHandle mh _ _) = do
+    p_ <- readMVar mh
+    case p_ of
+#ifdef mingw32_HOST_OS
+      OpenHandle h -> do
+        pid <- System.Win32.Process.getProcessId h
+        return $ Just pid
 #else
-chanSource :: MonadIO m => Chan o -> ConduitM i o m b
+      OpenHandle pid -> return $ Just pid
+#endif
+      _ -> return Nothing
 #endif
-chanSource c = do
-  x <- liftIO $ readChan c
-  yield x
-  chanSource c
-  
\ No newline at end of file