Merge branch 'master' into script-fsm

diff --cc haskell-lsp-test.cabal
index 7deb60eb507226b149236d15644ae1df2225c186,4a3c5ed9c1d957b9546382f254c6b86c0a738815..c5d1391eca38a99d3546c5ef407c06eaf5f564a0
--- 1/haskell-lsp-test.cabal
--- 2/haskell-lsp-test.cabal
+++ b/haskell-lsp-test.cabal
@@@ -114,10 -71,9 +114,9 @@@ test-suite test
                       , aeson
                       , unordered-containers
                       , text
-   other-modules:       ParsingTests
    default-language:    Haskell2010
  
 -executable example
 +executable lsp-test-example
    hs-source-dirs:      example
    main-is:             Main.hs
    default-language:    Haskell2010

diff --cc lib/Language/Haskell/LSP/Test.hs
Simple merge

diff --cc lib/Language/Haskell/LSP/Test/Replay.hs
Simple merge

diff --cc src/Language/Haskell/LSP/Test/Parsing.hs
index 06776cb7b8ca663dda5a001bbc8bdd97b75cd2d0,3ecc53888b31f5090b64344a866d512b5dd1460b..88109a5155801e2ed3015861c019ee4fd93217d6
--- 1/src/Language/Haskell/LSP/Test/Parsing.hs
--- 2/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.hs
@@@ -85,13 -85,10 +85,13 @@@ castMsg = fromMaybe (error "Failed cast
  -- | A version of encode that encodes FromServerMessages as if they
  -- weren't wrapped.
  encodeMsg :: FromServerMessage -> B.ByteString
 -encodeMsg = encode . genericToJSON (defaultOptions { sumEncoding = UntaggedValue })
 +encodeMsg = encode . toJSONMsg
 +
 +toJSONMsg :: FromServerMessage -> Value
 +toJSONMsg = genericToJSON (defaultOptions { sumEncoding = UntaggedValue })
  
  -- | Matches if the message is a log message notification or a show message notification/request.
- loggingNotification :: (MonadIO m, MonadSessionConfig m) => ConduitParser FromServerMessage m FromServerMessage
+ loggingNotification :: Session FromServerMessage
  loggingNotification = named "Logging notification" $ satisfy shouldSkip
    where
      shouldSkip (NotLogMessage _) = True