Add MonadFail constraint for GHC 8.6.1

And bump haskell-lsp and resolver

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index a2cd380bf920bbd38d2889db8a671c0338f98d33..28d4eddec1591fbbe190fc825abc5c0c1453a0f5 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
@@ -32,6 +33,9 @@ import Control.Lens hiding (List)
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Except
+#if __GLASGOW_HASKELL__ >= 806
+import qualified Control.Monad.Fail as Fail
+#endif
 import Control.Monad.Trans.Reader (ReaderT, runReaderT)
 import qualified Control.Monad.Trans.Reader as Reader (ask)
 import Control.Monad.Trans.State (StateT, runStateT)
@@ -144,6 +148,11 @@ instance Monad m => HasState SessionState (ConduitM a b (StateT SessionState m))
 
 type ParserStateReader a s r m = ConduitParser a (StateT s (ReaderT r m))
 
+#if __GLASGOW_HASKELL__ >= 806
+instance (Fail.MonadFail m) => Fail.MonadFail (ParserStateReader a s r m) where
+  fail = Fail.fail
+#endif
+
 runSession :: SessionContext -> SessionState -> Session a -> IO (a, SessionState)
 runSession context state session = runReaderT (runStateT conduit state) context
   where

diff --git a/stack.yaml b/stack.yaml
index b229bb846b335a7b269459924803b4671d456d63..2c97f95d41adcd18f7e966e5321d538ae745a3c0 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,7 +1,7 @@
-resolver: lts-12.9
+resolver: lts-12.17
 packages:
   - .
 
 extra-deps:
-  - haskell-lsp-0.8.0.0
-  - haskell-lsp-types-0.8.0.0
+  - haskell-lsp-0.8.0.1
+  - haskell-lsp-types-0.8.0.1