projects
/
lsp-test.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
55ae688
)
update equality function
author
Zubin Duggal
<zubin@cmi.ac.in>
Thu, 25 Feb 2021 18:51:56 +0000
(
00:21
+0530)
committer
Zubin Duggal
<zubin@cmi.ac.in>
Thu, 25 Feb 2021 18:59:15 +0000
(
00:29
+0530)
src/Language/LSP/Test/Parsing.hs
patch
|
blob
|
history
diff --git
a/src/Language/LSP/Test/Parsing.hs
b/src/Language/LSP/Test/Parsing.hs
index e55909f4c59fc9076c665d9b8f66811ae9981bb9..b5221168dff1ba2bf6d2f55fecb96fa99c3b3935 100644
(file)
--- a/
src/Language/LSP/Test/Parsing.hs
+++ b/
src/Language/LSP/Test/Parsing.hs
@@
-112,8
+112,10
@@
named s (Session x) = Session (Data.Conduit.Parser.named s x)
message :: SServerMethod m -> Session (ServerMessage m)
message m1 = named (T.pack $ "Request for: " <> show m1) $ satisfyMaybe $ \case
FromServerMess m2 msg -> do
message :: SServerMethod m -> Session (ServerMessage m)
message m1 = named (T.pack $ "Request for: " <> show m1) $ satisfyMaybe $ \case
FromServerMess m2 msg -> do
- HRefl <- mEqServer m1 m2
- pure msg
+ res <- mEqServer m1 m2
+ case res of
+ Right HRefl -> pure msg
+ Left f -> Nothing
_ -> Nothing
customRequest :: T.Text -> Session (ServerMessage (CustomMethod :: Method FromServer Request))
_ -> Nothing
customRequest :: T.Text -> Session (ServerMessage (CustomMethod :: Method FromServer Request))
@@
-163,7
+165,7
@@
anyResponse = named "Any response" $ satisfy $ \case
response :: SMethod (m :: Method FromClient Request) -> Session (ResponseMessage m)
response m1 = named (T.pack $ "Response for: " <> show m1) $ satisfyMaybe $ \case
FromServerRsp m2 msg -> do
response :: SMethod (m :: Method FromClient Request) -> Session (ResponseMessage m)
response m1 = named (T.pack $ "Response for: " <> show m1) $ satisfyMaybe $ \case
FromServerRsp m2 msg -> do
- HRefl <- mEqClient m1 m2
+ HRefl <-
runEq
mEqClient m1 m2
pure msg
_ -> Nothing
pure msg
_ -> Nothing
@@
-173,17
+175,10
@@
responseForId m lid = named (T.pack $ "Response for id: " ++ show lid) $ do
satisfyMaybe $ \msg -> do
case msg of
FromServerMess _ _ -> Nothing
satisfyMaybe $ \msg -> do
case msg of
FromServerMess _ _ -> Nothing
- FromServerRsp m' rspMsg@(ResponseMessage _ lid' _) ->
- case mEqClient m m' of
- Just HRefl -> do
- guard (lid' == Just lid)
+ FromServerRsp m' rspMsg@(ResponseMessage _ lid' _) -> do
+ HRefl <- runEq mEqClient m m'
+ guard (Just lid == lid')
pure rspMsg
pure rspMsg
- Nothing
- | SCustomMethod tm <- m
- , SCustomMethod tm' <- m'
- , tm == tm'
- , lid' == Just lid -> pure rspMsg
- _ -> empty
-- | Matches any type of message.
anyMessage :: Session FromServerMessage
-- | Matches any type of message.
anyMessage :: Session FromServerMessage