X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FParsing.hs;h=53485f19c832ed0cdaab269fbc758aec16cbb1c8;hb=fd07886ece86ce39f438ce1d031c51421eedecaf;hp=9d2dd702c78d2065b53835e12cc11a4f3dd4b9be;hpb=c78547478baf6c47849921fa8e1c391472685e99;p=lsp-test.git

diff --git a/src/Language/Haskell/LSP/Test/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs
index 9d2dd70..53485f1 100644
--- a/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.hs
@@ -3,49 +3,96 @@
 {-# LANGUAGE FlexibleInstances #-}
 module Language.Haskell.LSP.Test.Parsing where
 
+import Control.Applicative
+import Control.Monad.Trans.Class
+import Control.Monad.IO.Class
+import Control.Monad.Trans.Reader
+import Control.Monad.Trans.State
 import Language.Haskell.LSP.Messages
 import Language.Haskell.LSP.Types
 import Language.Haskell.LSP.Test.Messages
-import Control.Concurrent
-import Text.Parsec hiding (satisfy)
-import Control.Monad
+import Language.Haskell.LSP.Test.Decoding
+import System.IO
+import Control.Concurrent.Chan
+import Control.Concurrent.MVar
+import Data.Conduit hiding (await)
+import Data.Conduit.Parser
 
 data MessageParserState = MessageParserState
 
-type MessageParser = ParsecT (Chan FromServerMessage) MessageParserState IO
+data SessionContext = SessionContext
+  {
+    serverIn :: Handle,
+    rootDir :: FilePath,
+    messageChan :: Chan FromServerMessage,
+    requestMap :: MVar RequestMap
+  }
 
-notification :: MessageParser FromServerMessage
+newtype SessionState = SessionState
+  {
+    curReqId :: LspId
+  }
+
+type ParserStateReader a s r m = ConduitParser a (StateT s (ReaderT r m))
+-- | A session representing one instance of launching and connecting to a server.
+-- 
+-- You can send and receive messages to the server within 'Session' via 'getMessage',
+-- 'sendRequest' and 'sendNotification'.
+--
+-- @
+-- runSession \"path\/to\/root\/dir\" $ do
+--   docItem <- getDocItem "Desktop/simple.hs" "haskell"
+--   sendNotification TextDocumentDidOpen (DidOpenTextDocumentParams docItem)
+--   diagnostics <- getMessage :: Session PublishDiagnosticsNotification
+-- @
+type Session = ParserStateReader FromServerMessage SessionState SessionContext IO
+
+-- | Matches if the message is a notification.
+notification :: Session FromServerMessage
 notification = satisfy isServerNotification
 
-request :: MessageParser FromServerMessage
+-- | Matches if the message is a request.
+request :: Session FromServerMessage
 request = satisfy isServerRequest
 
-response :: MessageParser FromServerMessage
+-- | Matches if the message is a response.
+response :: Session FromServerMessage
 response = satisfy isServerResponse
 
-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"))
-
-testSymbols = RspDocumentSymbols (ResponseMessage "2.0" (IdRspInt 0) (Just (List [])) Nothing)
-
-instance Stream (Chan a) IO a where
-  uncons c = do
-    x <- readChan c
-    return $ Just (x, c)
-
-test :: IO ()
-test = do
-  chan <- newChan
-  let parser = do
-        n <- count 2 notification
-        rsp <- response
-        return (n, rsp)
-  forkIO $ forM_ [testLog, testLog, testSymbols] $ \x -> do
-    writeChan chan x
-    threadDelay 1000000
-  x <- runParserT parser MessageParserState "" chan
-  print x
\ No newline at end of file
+-- | Matches if the message is a log message notification or a show message notification/request.
+loggingNotification :: Session FromServerMessage
+loggingNotification = satisfy shouldSkip
+  where
+    shouldSkip (NotLogMessage _) = True
+    shouldSkip (NotShowMessage _) = True
+    shouldSkip (ReqShowMessage _) = True
+    shouldSkip _ = False
+
+satisfy :: Monad m => (a -> Bool) -> ConduitParser a m a
+satisfy pred = do
+  x <- await
+  if pred x
+    then return x
+    else empty
+
+chanSource:: MonadIO m => Chan o -> ConduitT i o m b
+chanSource c = do
+  x <- liftIO $ readChan c
+  yield x
+  chanSource c
+
+runSession' :: Chan FromServerMessage -> SessionContext -> SessionState -> Session a -> IO (a, SessionState)
+runSession' chan context state session = runReaderT (runStateT conduit state) context
+  where conduit = runConduit $ chanSource chan .| runConduitParser session
+
+get :: Monad m => ParserStateReader a s r m s
+get = lift Control.Monad.Trans.State.get
+
+put :: Monad m => s -> ParserStateReader a s r m ()
+put = lift . Control.Monad.Trans.State.put
+
+modify :: Monad m => (s -> s) -> ParserStateReader a s r m ()
+modify = lift . Control.Monad.Trans.State.modify
+
+ask :: Monad m => ParserStateReader a s r m r
+ask = lift $ lift Control.Monad.Trans.Reader.ask
\ No newline at end of file