X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest%2FParsing.hs;h=12ef1a6281547c4fc73dd4ad812cb71c529e95f5;hb=af401b6d0439751d73ea230a219f37eb57286c90;hp=70481b979a83a67434dff19f1bb304af3ee65789;hpb=46ab99233a7ba2045c51a85125afff764486f72b;p=lsp-test.git diff --git a/src/Language/Haskell/LSP/Test/Parsing.hs b/src/Language/Haskell/LSP/Test/Parsing.hs index 70481b9..12ef1a6 100644 --- a/src/Language/Haskell/LSP/Test/Parsing.hs +++ b/src/Language/Haskell/LSP/Test/Parsing.hs @@ -6,6 +6,7 @@ module Language.Haskell.LSP.Test.Parsing ( -- $receiving satisfy + , satisfyMaybe , message , anyRequest , anyResponse @@ -74,7 +75,7 @@ satisfyMaybe :: (FromServerMessage -> Maybe a) -> Session a satisfyMaybe pred = do skipTimeout <- overridingTimeout <$> get - timeoutId <- curTimeoutId <$> get + timeoutId <- getCurTimeoutId unless skipTimeout $ do chan <- asks messageChan timeout <- asks (messageTimeout . config) @@ -84,8 +85,7 @@ satisfyMaybe pred = do x <- Session await - unless skipTimeout $ - modify $ \s -> s { curTimeoutId = timeoutId + 1 } + unless skipTimeout (bumpTimeoutId timeoutId) modify $ \s -> s { lastReceivedMessage = Just x }