From: jneira Date: Thu, 11 Jul 2019 12:16:05 +0000 (+0200) Subject: Avoid error when trying to shutdown manual js session X-Git-Tag: 0.6.1.0~2^2~14 X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=6f031f598fdccd1b85b8086ac2d07b41e8ef896a Avoid error when trying to shutdown manual js session --- diff --git a/src/Language/Haskell/LSP/Test/Decoding.hs b/src/Language/Haskell/LSP/Test/Decoding.hs index af91928..52c84a4 100644 --- a/src/Language/Haskell/LSP/Test/Decoding.hs +++ b/src/Language/Haskell/LSP/Test/Decoding.hs @@ -94,7 +94,7 @@ getRequestMap = foldl helper HM.empty matchResponseMsgType :: ClientMethod -> B.ByteString -> FromServerMessage matchResponseMsgType req = case req of Initialize -> RspInitialize . decoded - Shutdown -> RspShutdown . decoded + Shutdown -> RspShutdown . decoded . removeNullResult TextDocumentHover -> RspHover . decoded TextDocumentCompletion -> RspCompletion . decoded CompletionItemResolve -> RspCompletionItemResolve . decoded @@ -120,6 +120,7 @@ matchResponseMsgType req = case req of where decoded x = fromMaybe (error $ "Couldn't decode response for the request type: " ++ show req ++ "\n" ++ show x) (decode x) + removeNullResult x = maybe x (<> "}") (B.stripSuffix ",\"result\":null}" x) decodeFromServerMsg :: RequestMap -> B.ByteString -> FromServerMessage decodeFromServerMsg reqMap bytes =