X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FSession.hs;h=db8bef5513e2c1e5dad7462d11ff52d400aaa21e;hp=3707dfd90f4caeb10e571f27dcca4abec649697e;hb=2ed0dbaf1233ec79ed0801b406ae9fbf4e36e8a4;hpb=1f39d55cc3fb2e840a115c12d7da3935b9529361

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 3707dfd..db8bef5 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -1,12 +1,33 @@
-module Language.Haskell.LSP.Test.Session where
-
-import Control.Concurrent
+{-# LANGUAGE OverloadedStrings #-}
+
+module Language.Haskell.LSP.Test.Session 
+  ( Session
+  , SessionState(..)
+  , SessionContext(..)
+  , runSessionWithHandles
+  , get
+  , put
+  , modify
+  , ask)
+
+where
+
+import Control.Concurrent hiding (yield)
+import Control.Lens hiding (List)
 import Control.Monad
+import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
-import Control.Monad.Trans.Reader
-import Control.Monad.Trans.State
+import Control.Monad.Trans.Reader (ReaderT, runReaderT)
+import qualified Control.Monad.Trans.Reader as Reader (ask)
+import Control.Monad.Trans.State (StateT, runStateT)
+import qualified Control.Monad.Trans.State as State (get, put, modify)
+import qualified Data.ByteString.Lazy.Char8 as B
+import Data.Aeson
 import Data.Conduit
 import Data.Conduit.Parser
+import Data.Foldable
+import Data.List
+import qualified Data.HashMap.Strict as HashMap
 import Language.Haskell.LSP.Messages
 import Language.Haskell.LSP.Types
 import Language.Haskell.LSP.VFS
@@ -45,24 +66,23 @@ type ParserStateReader a s r m = ConduitParser a (StateT s (ReaderT r m))
 -- @
 type Session = ParserStateReader FromServerMessage SessionState SessionContext IO
 
+type SessionProcessor = ConduitT FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO))
 
-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
+runSession' :: Chan FromServerMessage -> SessionProcessor () -> SessionContext -> SessionState -> Session a -> IO (a, SessionState)
+runSession' chan preprocessor context state session = runReaderT (runStateT conduit state) context
+  where conduit = runConduit $ chanSource chan .| preprocessor .| runConduitParser session
 
 get :: Monad m => ParserStateReader a s r m s
-get = lift Control.Monad.Trans.State.get
+get = lift State.get
 
 put :: Monad m => s -> ParserStateReader a s r m ()
-put = lift . Control.Monad.Trans.State.put
+put = lift . State.put
 
 modify :: Monad m => (s -> s) -> ParserStateReader a s r m ()
-modify = lift . Control.Monad.Trans.State.modify
+modify = lift . State.modify
 
 ask :: Monad m => ParserStateReader a s r m r
-ask = lift $ lift Control.Monad.Trans.Reader.ask
-
-
+ask = lift $ lift Reader.ask
 
 -- | An internal version of 'runSession' that allows for a custom handler to listen to the server.
 -- It also does not automatically send initialize and exit messages.
@@ -84,11 +104,48 @@ runSessionWithHandles serverIn serverOut serverHandler rootDir session = do
   initRsp <- newEmptyMVar
 
   let context = SessionContext serverIn absRootDir messageChan reqMap initRsp
-      initState = SessionState (IdInt 9) mempty
+      initState = SessionState (IdInt 0) mempty
 
-  threadId <- forkIO $ void $ runSession' meaninglessChan context initState (serverHandler serverOut)
-  (result, _) <- runSession' messageChan context initState session
+  threadId <- forkIO $ void $ runSession' meaninglessChan processor context initState (serverHandler serverOut)
+  (result, _) <- runSession' messageChan processor context initState session
 
   killThread threadId
 
   return result
+
+  where processor :: SessionProcessor ()
+        processor = awaitForever $ \msg -> do
+          processTextChanges msg
+          yield msg
+
+
+processTextChanges :: FromServerMessage -> SessionProcessor ()
+processTextChanges (ReqApplyWorkspaceEdit r) = do
+  List changeParams <- case r ^. params . edit . documentChanges of
+    Just cs -> mapM applyTextDocumentEdit cs
+    Nothing -> case r ^. params . edit . changes of
+      Just cs -> mapM (uncurry applyTextEdit) (List (HashMap.toList cs))
+      Nothing -> return (List [])
+
+  let groupedParams = groupBy (\a b -> (a ^. textDocument == b ^. textDocument)) changeParams
+      mergedParams = map mergeParams groupedParams
+
+  forM_ mergedParams $ \p -> do
+    h <- serverIn <$> lift (lift Reader.ask)
+    let msg = NotificationMessage "2.0" TextDocumentDidChange p
+    liftIO $ B.hPut h $ addHeader (encode msg)
+
+  where applyTextDocumentEdit (TextDocumentEdit docId (List edits)) = do
+          oldVFS <- vfs <$> lift State.get
+          let changeEvents = map (\e -> TextDocumentContentChangeEvent (Just (e ^. range)) Nothing (e ^. newText)) edits
+              params = DidChangeTextDocumentParams docId (List changeEvents)
+          newVFS <- liftIO $ changeVFS oldVFS (fmClientDidChangeTextDocumentNotification params)
+          lift $ State.modify (\s -> s { vfs = newVFS })
+          return params
+
+        applyTextEdit uri edits = applyTextDocumentEdit (TextDocumentEdit (VersionedTextDocumentIdentifier uri 0) edits)
+
+        mergeParams :: [DidChangeTextDocumentParams] -> DidChangeTextDocumentParams
+        mergeParams params = let events = concat (toList (map (toList . (^. contentChanges)) params))
+                              in DidChangeTextDocumentParams (head params ^. textDocument) (List events)
+processTextChanges _ = return ()
\ No newline at end of file