X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FExceptions.hs;h=3f122f25281accde8bd063c8d52f6cd6520c8a39;hb=d8e460543b7cbc32550bed20d20ef4b13d6705a5;hp=25db5848dd07f444f97644e59e0518f6dcf988c9;hpb=22df37c703e39fa5ebeb130be5785b3a9713c520;p=lsp-test.git

diff --git a/src/Language/Haskell/LSP/Test/Exceptions.hs b/src/Language/Haskell/LSP/Test/Exceptions.hs
index 25db584..3f122f2 100644
--- a/src/Language/Haskell/LSP/Test/Exceptions.hs
+++ b/src/Language/Haskell/LSP/Test/Exceptions.hs
@@ -2,12 +2,16 @@ module Language.Haskell.LSP.Test.Exceptions where
 
 import Control.Exception
 import Language.Haskell.LSP.Messages
+import Language.Haskell.LSP.Types
+import Data.Aeson
+import qualified Data.ByteString.Lazy.Char8 as B
 
 data SessionException = TimeoutException
                       | UnexpectedMessageException String FromServerMessage
                       | ReplayOutOfOrderException FromServerMessage [FromServerMessage]
                       | UnexpectedDiagnosticsException
                       | IncorrectApplyEditRequestException String
+                      | UnexpectedResponseError LspIdRsp ResponseError
 
 instance Exception SessionException
 
@@ -19,11 +23,14 @@ instance Show SessionException where
     "Last message accepted: " ++ show lastMsg
   show (ReplayOutOfOrderException received expected) =
     "Replay is out of order:\n" ++
-    "Received from server:" ++ show received ++ "\n" ++
-    "Expected one of: " ++ concatMap show expected
+    -- Print json so its a bit easier to update the session logs
+    "Received from server:\n" ++ B.unpack (encode received) ++ "\n" ++
+    "Expected one of:\n" ++ unlines (map (B.unpack . encode) expected)
   show UnexpectedDiagnosticsException = "Unexpectedly received diagnostics from the server."
   show (IncorrectApplyEditRequestException msgStr) = "ApplyEditRequest didn't contain document, instead received:\n"
                                           ++ msgStr
+  show (UnexpectedResponseError lid e) = "Received an exepected error in a response for id " ++ show lid ++ ":\n"
+                                          ++ show e
 
 anySessionException :: SessionException -> Bool
 anySessionException = const True
\ No newline at end of file