Compatibility with GHC 8.2.1

diff --git a/src/Language/Haskell/LSP/Test/Compat.hs b/src/Language/Haskell/LSP/Test/Compat.hs
index 00f2c0b08b848e94b671b7c0028f98f411ae8c95..cd7de0885e31db77eabd2f5b5b289255bf44385e 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Compat.hs
+++ b/src/Language/Haskell/LSP/Test/Compat.hs
@@ -1,7 +1,9 @@
 {-# LANGUAGE CPP #-}
-
 module Language.Haskell.LSP.Test.Compat where
 
+import Control.Concurrent.Chan
+import Control.Monad.IO.Class
+import Data.Conduit
 
 #ifdef mingw32_HOST_OS
 
@@ -16,3 +18,13 @@ getProcessID :: IO Int
 getProcessID = fromIntegral <$> P.getProcessID
 
 #endif
+
+#if MIN_VERSION_conduit(1,3,0)
+chanSource :: MonadIO m => Chan o -> ConduitT i o m b
+#else
+chanSource :: MonadIO m => Chan o -> ConduitM i o m b
+#endif
+chanSource c = do
+  x <- liftIO $ readChan c
+  yield x
+  chanSource c

diff --git a/src/Language/Haskell/LSP/Test/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs
index 2e829f372284373fa6d5673f9509e140c250387e..49c24c9ae52715862a05baf0cfbe294ef04a6a82 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.hs
@@ -18,6 +18,7 @@ import Data.Conduit.Parser
 import Data.Maybe
 import Language.Haskell.LSP.Messages
 import Language.Haskell.LSP.Types 
+import Language.Haskell.LSP.Test.Compat
 import Language.Haskell.LSP.Test.Decoding
 import Language.Haskell.LSP.Test.Messages
 import System.IO
@@ -108,12 +109,6 @@ satisfy pred = do
     then return x
     else empty
 
-chanSource :: MonadIO m => Chan o -> ConduitT i o m b
-chanSource c = do
-  x <- liftIO $ readChan c
-  yield x
-  chanSource c
-
 runSession' :: Chan FromServerMessage -> SessionContext -> SessionState -> Session a -> IO (a, SessionState)
 runSession' chan context state session = runReaderT (runStateT conduit state) context
   where conduit = runConduit $ chanSource chan .| runConduitParser session