From: Luke Lau <luke_lau@icloud.com>
Date: Mon, 12 Nov 2018 17:42:34 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/Bubba/lsp-test
X-Git-Tag: 0.5.0.0~2
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=37da26eb81afa8709e49f2ed0aa83c55c4de8587;hp=c11f5798ff6f9634e24c6521eb01d03a27e718ac

Merge branch 'master' of https://github.com/Bubba/lsp-test
---

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index f0d410a..dc3c6ff 100644
--- 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 #-}
@@ -34,6 +35,9 @@ import Control.Monad
 import Control.Monad.Fail
 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)
@@ -71,16 +75,18 @@ import System.IO
 
 type Session = ParserStateReader FromServerMessage SessionState SessionContext IO
 
+#if __GLASGOW_HASKELL__ >= 806
 instance MonadFail Session where
   fail s = do
     lastMsg <- fromJust . lastReceivedMessage <$> get
     liftIO $ throw (UnexpectedMessage s lastMsg)
+#endif
 
 -- | Stuff you can configure for a 'Session'.
 data SessionConfig = SessionConfig
   { messageTimeout :: Int  -- ^ Maximum time to wait for a message in seconds, defaults to 60.
   , logStdErr      :: Bool -- ^ Redirect the server's stderr to this stdout, defaults to False.
-  , logMessages    :: Bool -- ^ Trace the messages sent and received to stdout, defaults to True.
+  , logMessages    :: Bool -- ^ Trace the messages sent and received to stdout, defaults to False.
   , logColor       :: Bool -- ^ Add ANSI color to the logged messages, defaults to True.
   , lspConfig      :: Maybe Value -- ^ The initial LSP config as JSON value, defaults to Nothing.
   }
diff --git a/stack.yaml b/stack.yaml
index 67d3be5..2c97f95 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,3 +1,7 @@
 resolver: lts-12.17
 packages:
   - .
+
+extra-deps:
+  - haskell-lsp-0.8.0.1
+  - haskell-lsp-types-0.8.0.1