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-Url: http://git.lukelau.me/?p=opengl.git;a=commitdiff_plain;h=37da26eb81afa8709e49f2ed0aa83c55c4de8587;hp=-c

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

37da26eb81afa8709e49f2ed0aa83c55c4de8587
diff --combined src/Language/Haskell/LSP/Test/Session.hs
index f0d410a,28d4edd..dc3c6ff
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@@ -1,8 -1,8 +1,9 @@@
+ {-# LANGUAGE CPP               #-}
  {-# LANGUAGE OverloadedStrings #-}
  {-# LANGUAGE FlexibleInstances #-}
  {-# LANGUAGE MultiParamTypeClasses #-}
  {-# LANGUAGE FlexibleContexts #-}
 +{-# LANGUAGE RankNTypes #-}
  
  module Language.Haskell.LSP.Test.Session
    ( Session
@@@ -31,9 -31,11 +32,12 @@@ import Control.Concurrent hiding (yield
  import Control.Exception
  import Control.Lens hiding (List)
  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,23 -73,17 +75,25 @@@ import System.I
  
  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.
    }
  
  -- | The configuration used in 'Language.Haskell.LSP.Test.runSession'.
  defaultConfig :: SessionConfig
 -defaultConfig = SessionConfig 60 False False True
 +defaultConfig = SessionConfig 60 False True True Nothing
  
  instance Default SessionConfig where
    def = defaultConfig
@@@ -152,6 -148,11 +158,6 @@@ instance Monad m => HasState SessionSta
  
  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