X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FParsing.hs;h=b6830357db5b32144f9629d900d5f42b91f64196;hp=2936b31347f9db69ecf4b1a3951c552336953cfb;hb=f0d93bbe47d55ab650909e0487c65c1048f1bb9a;hpb=9d89c237916fbeed63ca52aa5f93465579a5c576 diff --git a/src/Language/Haskell/LSP/Test/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs index 2936b31..b683035 100644 --- a/src/Language/Haskell/LSP/Test/Parsing.hs +++ b/src/Language/Haskell/LSP/Test/Parsing.hs @@ -10,7 +10,6 @@ import Control.Lens import Control.Monad.IO.Class import Control.Monad import Data.Aeson -import Data.Aeson.Encode.Pretty import qualified Data.ByteString.Lazy.Char8 as B import Data.Conduit.Parser import Data.Maybe @@ -20,7 +19,6 @@ import Language.Haskell.LSP.Messages import Language.Haskell.LSP.Types as LSP hiding (error) import Language.Haskell.LSP.Test.Messages import Language.Haskell.LSP.Test.Session -import System.Console.ANSI satisfy :: (FromServerMessage -> Bool) -> Session FromServerMessage satisfy pred = do @@ -43,11 +41,7 @@ satisfy pred = do if pred x then do - shouldLog <- asks $ logMessages . config - liftIO $ when shouldLog $ do - setSGR [SetColor Foreground Dull Magenta] - putStrLn $ "<-- " ++ B.unpack (encodeMsgPretty x) - setSGR [Reset] + logMsg LogServer x return x else empty @@ -88,9 +82,6 @@ castMsg = fromMaybe (error "Failed casting a message") . decode . encodeMsg encodeMsg :: FromServerMessage -> B.ByteString encodeMsg = encode . genericToJSON (defaultOptions { sumEncoding = UntaggedValue }) -encodeMsgPretty :: FromServerMessage -> B.ByteString -encodeMsgPretty = encodePretty . genericToJSON (defaultOptions { sumEncoding = UntaggedValue }) - -- | Matches if the message is a log message notification or a show message notification/request. loggingNotification :: Session FromServerMessage loggingNotification = named "Logging notification" $ satisfy shouldSkip