Remove dependency on process-1.6.3

diff --git a/haskell-lsp-test.cabal b/haskell-lsp-test.cabal
index 42171da1de244bd79c1ca1312cd1ce3fe003719c..510b7583a128835fcf04903b017846ff24f8a697 100644 (file)
--- a/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@ -33,7 +33,7 @@ library
                      , lens
                      , mtl
                      , parser-combinators
-                     , process >= 1.6.3
+                     , process
                      , text
                      , transformers
                      , unordered-containers

diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs
index 8da170c0d4fe6e984e2d21ffcd05dab6a79cfbc3..3331c096a7a71e9a84e6cd76348f04faff6aad36 100644 (file)
--- a/src/Language/Haskell/LSP/Test.hs
+++ b/src/Language/Haskell/LSP/Test.hs
@@ -106,7 +106,7 @@ runSessionWithConfig :: SessionConfig -- ^ The capabilities the client should ha
                      -> Session a -- ^ The session to run.
                      -> IO a
 runSessionWithConfig config serverExe rootDir session = do
-  pid <- getProcessID
+  pid <- getCurrentProcessID
   absRootDir <- canonicalizePath rootDir
 
   let initializeParams = InitializeParams (Just pid)

diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs
index 2372b09eabdb70e20fb25024eb244bc898f134d1..6b018cce5a526e7e111d459d3bd3b68d3d21ed09 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Compat.hs
+++ b/src/Language/Haskell/LSP/Test/Compat.hs
@@ -8,19 +8,48 @@ module Language.Haskell.LSP.Test.Compat where
 import Control.Concurrent.Chan
 import Control.Monad.IO.Class
 import Data.Conduit
+import Data.Maybe
+
+#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.Win32.Process as P (getCurrentProcessId)
-getProcessID :: IO Int
-getProcessID = fromIntegral <$> P.getCurrentProcessId
 
+getCurrentProcessID :: IO Int
+#ifdef mingw32_HOST_OS
+getCurrentProcessID = fromIntegral <$> System.Win32.Process.getCurrentProcessId
 #else
+getCurrentProcessID = fromIntegral <$> System.Posix.Process.getProcessID
+#endif
 
-import qualified System.Posix.Process as P (getProcessID)
-getProcessID :: IO Int
-getProcessID = fromIntegral <$> P.getProcessID
-
+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
+      OpenHandle pid -> return $ Just pid
+#endif
+      _ -> return Nothing
 #endif
 
 #if MIN_VERSION_conduit(1,3,0)
@@ -32,4 +61,3 @@ chanSource c = do
   x <- liftIO $ readChan c
   yield x
   chanSource c
-  
\ No newline at end of file

diff --git a/src/Language/Haskell/LSP/Test/Server.hs b/src/Language/Haskell/LSP/Test/Server.hs
index 473f2c76e1c39c46252e0f1b0a0933a05db60185..c59a755979314316d4759765088f883df873c73a 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Server.hs
+++ b/src/Language/Haskell/LSP/Test/Server.hs
@@ -2,7 +2,7 @@ module Language.Haskell.LSP.Test.Server (withServer) where
 
 import Control.Concurrent
 import Control.Monad
-import Data.Maybe
+import Language.Haskell.LSP.Test.Compat
 import System.IO
 import System.Process
 
@@ -19,7 +19,7 @@ withServer serverExe f = do
   hSetBuffering serverErr NoBuffering
   errSinkThread <- forkIO $ forever $ hGetLine serverErr
 
-  pid <- fromIntegral . fromJust <$> getPid serverProc
+  pid <- getProcessID serverProc
 
   result <- f serverIn serverOut pid
 

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index d12ed003a2d67e212156c9cbe5810c2ccc17055f..97820144b61971fc28ab509b2ceb4f03bb20249d 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -91,7 +91,7 @@ data SessionState = SessionState
 
 type ParserStateReader a s r m = ConduitParser a (StateT s (ReaderT r m))
 
-type SessionProcessor = ConduitT FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO))
+type SessionProcessor = ConduitM FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO))
 
 runSession :: Chan FromServerMessage -> SessionProcessor () -> SessionContext -> SessionState -> Session a -> IO (a, SessionState)
 runSession chan preprocessor context state session = runReaderT (runStateT conduit state) context