X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FParsing.hs;h=693c62e9aab0670e83001003803d72798cb2ec1f;hb=5170a20560a68b8fcaed83ecaf6146d84a147992;hp=b5f5b6b4a740a3d17642cd185293f3877ad469a3;hpb=f1238f8db54eafbf0e3352140818875ad4cfd997;p=opengl.git

diff --git a/src/Language/Haskell/LSP/Test/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs
index b5f5b6b..693c62e 100644
--- a/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.hs
@@ -1,46 +1,59 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes #-}
 module Language.Haskell.LSP.Test.Parsing where
 
-import Control.Monad.IO.Class
-import Control.Monad.Trans.Reader
+import Control.Applicative
+import Data.Aeson
 import qualified Data.ByteString.Lazy.Char8 as B
+import Data.Conduit.Parser
+import Data.Maybe
 import Language.Haskell.LSP.Messages
-import Language.Haskell.LSP.Types
+import Language.Haskell.LSP.Types hiding (error)
 import Language.Haskell.LSP.Test.Messages
-import Language.Haskell.LSP.Test.Decoding
-import System.IO
-import Control.Concurrent
-import Text.Parsec hiding (satisfy)
 
-data MessageParserState = MessageParserState
+-- | Matches if the message is a notification.
+anyNotification :: Monad m => ConduitParser FromServerMessage m FromServerMessage
+anyNotification = satisfy isServerNotification
 
-data SessionContext = SessionContext
-  {
-    serverIn :: Handle,
-    rootDir :: FilePath,
-    messageChan :: Chan FromServerMessage,
-    requestMap :: MVar RequestMap
-  }
+notification :: forall m a. (Monad m, FromJSON a) => ConduitParser FromServerMessage m (NotificationMessage ServerMethod a)
+notification = do
+  let parser = decode . encodeMsg :: FromServerMessage -> Maybe (NotificationMessage ServerMethod a)
+  x <- satisfy (isJust . parser)
+  return $ decodeMsg $ encodeMsg x
 
-newtype SessionState = SessionState
-  {
-    curReqId :: LspId
-  }
+-- | Matches if the message is a request.
+anyRequest :: Monad m => ConduitParser FromServerMessage m FromServerMessage
+anyRequest = satisfy isServerRequest
 
-type Session = ParsecT (Chan FromServerMessage) SessionState (ReaderT SessionContext IO)
+request :: forall m a b. (Monad m, FromJSON a, FromJSON b) => ConduitParser FromServerMessage m (RequestMessage ServerMethod a b)
+request = do
+  let parser = decode . encodeMsg :: FromServerMessage -> Maybe (RequestMessage ServerMethod a b)
+  x <- satisfy (isJust . parser)
+  return $ decodeMsg $ encodeMsg x
 
-notification :: Session FromServerMessage
-notification = satisfy isServerNotification
+-- | Matches if the message is a response.
+anyResponse :: Monad m => ConduitParser FromServerMessage m FromServerMessage
+anyResponse = satisfy isServerResponse
 
-request :: Session FromServerMessage
-request = satisfy isServerRequest
+response :: forall m a. (Monad m, FromJSON a) => ConduitParser FromServerMessage m (ResponseMessage a)
+response = do
+  let parser = decode . encodeMsg :: FromServerMessage -> Maybe (ResponseMessage a)
+  x <- satisfy (isJust . parser)
+  return $ decodeMsg $ encodeMsg x
 
-response :: Session FromServerMessage
-response = satisfy isServerResponse
+-- | A version of encode that encodes FromServerMessages as if they
+-- weren't wrapped.
+encodeMsg :: FromServerMessage -> B.ByteString
+encodeMsg = encode . genericToJSON (defaultOptions { sumEncoding = UntaggedValue })
 
-loggingNotification :: Session FromServerMessage
+decodeMsg :: FromJSON a => B.ByteString -> a
+decodeMsg x = fromMaybe (error $ "Unexpected message type\nGot:\n " ++ show x)
+                  (decode x)
+
+-- | Matches if the message is a log message notification or a show message notification/request.
+loggingNotification :: Monad m => ConduitParser FromServerMessage m FromServerMessage
 loggingNotification = satisfy shouldSkip
   where
     shouldSkip (NotLogMessage _) = True
@@ -48,16 +61,17 @@ loggingNotification = satisfy shouldSkip
     shouldSkip (ReqShowMessage _) = True
     shouldSkip _ = False
 
-satisfy :: (Stream s m a, Eq a, Show a) => (a -> Bool) -> ParsecT s u m a
-satisfy pred = tokenPrim show nextPos test
-  where nextPos x _ _ = x
-        test x = if pred x then Just x else Nothing
-
-testLog = NotLogMessage (NotificationMessage "2.0" WindowLogMessage (LogMessageParams MtLog "Hello world"))
+publishDiagnosticsNotification :: Monad m => ConduitParser FromServerMessage m PublishDiagnosticsNotification
+publishDiagnosticsNotification = do
+  NotPublishDiagnostics diags <- satisfy test
+  return diags
+  where test (NotPublishDiagnostics _) = True
+        test _ = False
 
-testSymbols = RspDocumentSymbols (ResponseMessage "2.0" (IdRspInt 0) (Just (List [])) Nothing)
+satisfy :: Monad m => (a -> Bool) -> ConduitParser a m a
+satisfy pred = do
+  x <- await
+  if pred x
+    then return x
+    else empty
 
-instance (MonadIO m) => Stream (Chan a) m a where
-  uncons c = do
-    x <- liftIO $ readChan c
-    return $ Just (x, c)