projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change runSession return result from passed session instead of ()
[opengl.git]
/
src
/
Language
/
Haskell
/
LSP
/
Test
/
Compat.hs
diff --git
a/src/Language/Haskell/LSP/Test/Compat.hs
b/src/Language/Haskell/LSP/Test/Compat.hs
index 00f2c0b08b848e94b671b7c0028f98f411ae8c95..e9b2c4c8f2fd7e645b9bf08f5bd0ac4c2bd46e98 100644
(file)
--- a/
src/Language/Haskell/LSP/Test/Compat.hs
+++ b/
src/Language/Haskell/LSP/Test/Compat.hs
@@
-1,7
+1,13
@@
{-# LANGUAGE CPP #-}
{-# LANGUAGE CPP #-}
-
+-- For some reason ghc warns about not using
+-- Control.Monad.IO.Class but it's needed for
+-- MonadIO
+{-# OPTIONS_GHC -Wunused-imports #-}
module Language.Haskell.LSP.Test.Compat where
module Language.Haskell.LSP.Test.Compat where
+import Control.Concurrent.Chan
+import Control.Monad.IO.Class
+import Data.Conduit
#ifdef mingw32_HOST_OS
#ifdef mingw32_HOST_OS
@@
-16,3
+22,13
@@
getProcessID :: IO Int
getProcessID = fromIntegral <$> P.getProcessID
#endif
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