X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FParsing.hs;h=b5f5b6b4a740a3d17642cd185293f3877ad469a3;hb=f1238f8db54eafbf0e3352140818875ad4cfd997;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..b5f5b6b 100644
--- a/src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/src/Language/Haskell/LSP/Test/Parsing.hs
@@ -3,26 +3,51 @@
 {-# LANGUAGE FlexibleInstances #-}
 module Language.Haskell.LSP.Test.Parsing where
 
+import Control.Monad.IO.Class
+import Control.Monad.Trans.Reader
+import qualified Data.ByteString.Lazy.Char8 as B
 import Language.Haskell.LSP.Messages
 import Language.Haskell.LSP.Types
 import Language.Haskell.LSP.Test.Messages
+import Language.Haskell.LSP.Test.Decoding
+import System.IO
 import Control.Concurrent
 import Text.Parsec hiding (satisfy)
-import Control.Monad
 
 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 Session = ParsecT (Chan FromServerMessage) SessionState (ReaderT SessionContext IO)
+
+notification :: Session FromServerMessage
 notification = satisfy isServerNotification
 
-request :: MessageParser FromServerMessage
+request :: Session FromServerMessage
 request = satisfy isServerRequest
 
-response :: MessageParser FromServerMessage
+response :: Session FromServerMessage
 response = satisfy isServerResponse
 
+loggingNotification :: Session FromServerMessage
+loggingNotification = satisfy shouldSkip
+  where
+    shouldSkip (NotLogMessage _) = True
+    shouldSkip (NotShowMessage _) = True
+    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
@@ -32,20 +57,7 @@ testLog = NotLogMessage (NotificationMessage "2.0" WindowLogMessage (LogMessageP
 
 testSymbols = RspDocumentSymbols (ResponseMessage "2.0" (IdRspInt 0) (Just (List [])) Nothing)
 
-instance Stream (Chan a) IO a where
+instance (MonadIO m) => Stream (Chan a) m a where
   uncons c = do
-    x <- readChan c
+    x <- liftIO $ 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