projects
/
lsp-test.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
98d0379
)
Minor cleanup
author
Zubin Duggal
<zubin@cmi.ac.in>
Thu, 4 Jun 2020 16:49:17 +0000
(22:19 +0530)
committer
Luke Lau
<luke_lau@icloud.com>
Fri, 9 Oct 2020 12:55:26 +0000
(13:55 +0100)
lsp-test.cabal
patch
|
blob
|
history
src/Language/Haskell/LSP/Test.hs
patch
|
blob
|
history
src/Language/Haskell/LSP/Test/Messages.hs
[deleted file]
patch
|
blob
|
history
src/Language/Haskell/LSP/Test/Parsing.hs
patch
|
blob
|
history
src/Language/Haskell/LSP/Test/Replay.hs
patch
|
blob
|
history
diff --git
a/lsp-test.cabal
b/lsp-test.cabal
index 2b89d3dccb1f3f7f9c8a4d882e4c778c5d3a5d0e..68b560bd1d65e770421f928d513e0014d55202ad 100644
(file)
--- a/
lsp-test.cabal
+++ b/
lsp-test.cabal
@@
-72,7
+72,6
@@
library
Language.Haskell.LSP.Test.Decoding
Language.Haskell.LSP.Test.Exceptions
Language.Haskell.LSP.Test.Files
Language.Haskell.LSP.Test.Decoding
Language.Haskell.LSP.Test.Exceptions
Language.Haskell.LSP.Test.Files
- Language.Haskell.LSP.Test.Messages
Language.Haskell.LSP.Test.Parsing
Language.Haskell.LSP.Test.Server
Language.Haskell.LSP.Test.Session
Language.Haskell.LSP.Test.Parsing
Language.Haskell.LSP.Test.Server
Language.Haskell.LSP.Test.Session
diff --git
a/src/Language/Haskell/LSP/Test.hs
b/src/Language/Haskell/LSP/Test.hs
index 6fefc038aea73482f66e6c6590399ada620ef0a0..845ff2593464b482f3b1d447ef113a2983d5d2d2 100644
(file)
--- a/
src/Language/Haskell/LSP/Test.hs
+++ b/
src/Language/Haskell/LSP/Test.hs
@@
-259,9
+259,6
@@
getDocumentEdit doc = do
let mMap = req ^. params . edit . changes
in maybe False (HashMap.member (doc ^. uri)) mMap
let mMap = req ^. params . edit . changes
in maybe False (HashMap.member (doc ^. uri)) mMap
-message :: SServerMethod m -> Session (ServerMessage m)
-message = undefined -- TODO
-
-- | Sends a request to the server and waits for its response.
-- Will skip any messages in between the request and the response
-- @
-- | Sends a request to the server and waits for its response.
-- Will skip any messages in between the request and the response
-- @
@@
-292,10
+289,7
@@
sendRequest method params = do
liftIO $ modifyMVar_ reqMap $
\r -> return $ fromJust $ updateRequestMap r id method
liftIO $ modifyMVar_ reqMap $
\r -> return $ fromJust $ updateRequestMap r id method
- let mkSession :: Session () -> Session ()
- mkSession x = x
-
- mkSession $ case splitClientMethod method of
+ ~() <- case splitClientMethod method of
IsClientReq -> sendMessage mess
IsClientEither -> sendMessage $ ReqMess mess
IsClientReq -> sendMessage mess
IsClientEither -> sendMessage $ ReqMess mess
diff --git
a/src/Language/Haskell/LSP/Test/Messages.hs
b/src/Language/Haskell/LSP/Test/Messages.hs
deleted file mode 100644
(file)
index
c225f13
..0000000
--- a/
src/Language/Haskell/LSP/Test/Messages.hs
+++ /dev/null
@@
-1,5
+0,0 @@
-{-# LANGUAGE RankNTypes #-}
-module Language.Haskell.LSP.Test.Messages where
-
-import Data.Aeson
-import Language.Haskell.LSP.Types
diff --git
a/src/Language/Haskell/LSP/Test/Parsing.hs
b/src/Language/Haskell/LSP/Test/Parsing.hs
index d1fec456221dca4168fe1fdcfa5cf076c7a1ef99..6c3c64afe8f9ff85a8fa0b6a3e2e0b9b501f4df1 100644
(file)
--- a/
src/Language/Haskell/LSP/Test/Parsing.hs
+++ b/
src/Language/Haskell/LSP/Test/Parsing.hs
@@
-1,5
+1,6
@@
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE GADTs #-}
@@
-11,6
+12,7
@@
module Language.Haskell.LSP.Test.Parsing
( -- $receiving
satisfy
, satisfyMaybe
( -- $receiving
satisfy
, satisfyMaybe
+ , message
, anyRequest
, anyResponse
, anyNotification
, anyRequest
, anyResponse
, anyNotification
@@
-33,7
+35,6
@@
import qualified Data.Text as T
import Data.Typeable
import Language.Haskell.LSP.Types
import qualified Language.Haskell.LSP.Types.Lens as LSP
import Data.Typeable
import Language.Haskell.LSP.Types
import qualified Language.Haskell.LSP.Types.Lens as LSP
-import Language.Haskell.LSP.Test.Messages
import Language.Haskell.LSP.Test.Session
-- $receiving
import Language.Haskell.LSP.Test.Session
-- $receiving
@@
-100,14
+101,8
@@
satisfyMaybe pred = do
named :: T.Text -> Session a -> Session a
named s (Session x) = Session (Data.Conduit.Parser.named s x)
named :: T.Text -> Session a -> Session a
named s (Session x) = Session (Data.Conduit.Parser.named s x)
-{-
--- | Matches a message of type @a@.
-message :: forall a. (Typeable a, FromJSON a) => Session a
-message =
- let parser = decode . encodeMsg :: FromServerMessage -> Maybe a
- in named (T.pack $ show $ head $ snd $ splitTyConApp $ last $ typeRepArgs $ typeOf parser) $
- satisfyMaybe parser
--}
+message :: SServerMethod m -> Session (ServerMessage m)
+message = undefined -- TODO
-- | Matches if the message is a notification.
anyNotification :: Session FromServerMessage
-- | Matches if the message is a notification.
anyNotification :: Session FromServerMessage
diff --git
a/src/Language/Haskell/LSP/Test/Replay.hs
b/src/Language/Haskell/LSP/Test/Replay.hs
index 2e3c514be51124be5b93777bc79e6005353fc654..f1272d5d30ea6101c40d51d103a853a56b076bf3 100644
(file)
--- a/
src/Language/Haskell/LSP/Test/Replay.hs
+++ b/
src/Language/Haskell/LSP/Test/Replay.hs
@@
-1,7
+1,7
@@
-- | A testing tool for replaying captured client logs back to a server,
-- and validating that the server output matches up with another log.
module Language.Haskell.LSP.Test.Replay
-- | A testing tool for replaying captured client logs back to a server,
-- and validating that the server output matches up with another log.
module Language.Haskell.LSP.Test.Replay
- ( replaySession
+ (
--
replaySession
)
where
)
where
@@
-24,10
+24,10
@@
import Language.Haskell.LSP.Test
import Language.Haskell.LSP.Test.Compat
import Language.Haskell.LSP.Test.Files
import Language.Haskell.LSP.Test.Decoding
import Language.Haskell.LSP.Test.Compat
import Language.Haskell.LSP.Test.Files
import Language.Haskell.LSP.Test.Decoding
-import Language.Haskell.LSP.Test.Messages
import Language.Haskell.LSP.Test.Server
import Language.Haskell.LSP.Test.Session
import Language.Haskell.LSP.Test.Server
import Language.Haskell.LSP.Test.Session
+{-
-- | Replays a captured client output and
-- makes sure it matches up with an expected response.
-- The session directory should have a captured session file in it
-- | Replays a captured client output and
-- makes sure it matches up with an expected response.
-- The session directory should have a captured session file in it
@@
-233,3
+233,4
@@
swapPid :: Int -> T.Text -> T.Text
swapPid pid t
| hasPid t = T.append (T.pack $ show pid) $ T.dropWhile (/= ':') t
| otherwise = t
swapPid pid t
| hasPid t = T.append (T.pack $ show pid) $ T.dropWhile (/= ':') t
| otherwise = t
+-}