From 5822dd40ae06ed413727cfeb3d1fd24b285db9e5 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Mon, 22 Apr 2019 16:55:05 +0100 Subject: [PATCH] Fix unhandle server notifications Bump to 0.5.1.3 --- ChangeLog.md | 4 ++++ lsp-test.cabal | 4 ++-- src/Language/Haskell/LSP/Test/Decoding.hs | 4 ++++ src/Language/Haskell/LSP/Test/Messages.hs | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 72ae186..3af75a6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Revision history for lsp-test +## 0.5.1.0 -- 2019-04-22 + +* Fix unhandled `window/progress` server notifications + ## 0.5.1.0 -- 2019-04-07 * Add getTypeDefinitions (@fendor) diff --git a/lsp-test.cabal b/lsp-test.cabal index 273edf0..f47f134 100644 --- a/lsp-test.cabal +++ b/lsp-test.cabal @@ -1,5 +1,5 @@ name: lsp-test -version: 0.5.1.2 +version: 0.5.1.3 synopsis: Functional test framework for LSP servers. description: A test framework for writing tests against @@ -36,7 +36,7 @@ library , parser-combinators:Control.Applicative.Combinators default-language: Haskell2010 build-depends: base >= 4.10 && < 5 - , haskell-lsp >= 0.8 && < 0.11 + , haskell-lsp >= 0.10 && < 0.11 , aeson , aeson-pretty , ansi-terminal diff --git a/src/Language/Haskell/LSP/Test/Decoding.hs b/src/Language/Haskell/LSP/Test/Decoding.hs index 2cbc41c..43810bb 100644 --- a/src/Language/Haskell/LSP/Test/Decoding.hs +++ b/src/Language/Haskell/LSP/Test/Decoding.hs @@ -131,6 +131,10 @@ decodeFromServerMsg reqMap bytes = WindowShowMessage -> NotShowMessage $ fromJust $ decode bytes WindowLogMessage -> NotLogMessage $ fromJust $ decode bytes CancelRequestServer -> NotCancelRequestFromServer $ fromJust $ decode bytes + WindowProgressStart -> NotProgressStart $ fromJust $ decode bytes + WindowProgressReport -> NotProgressReport $ fromJust $ decode bytes + WindowProgressDone -> NotProgressDone $ fromJust $ decode bytes + WindowProgressCancel -> NotProgressCancel $ fromJust $ decode bytes TelemetryEvent -> NotTelemetry $ fromJust $ decode bytes WindowShowMessageRequest -> ReqShowMessage $ fromJust $ decode bytes ClientRegisterCapability -> ReqRegisterCapability $ fromJust $ decode bytes diff --git a/src/Language/Haskell/LSP/Test/Messages.hs b/src/Language/Haskell/LSP/Test/Messages.hs index 02fa7fc..258f91b 100644 --- a/src/Language/Haskell/LSP/Test/Messages.hs +++ b/src/Language/Haskell/LSP/Test/Messages.hs @@ -90,6 +90,10 @@ handleServerMessage request response notification msg = case msg of (NotPublishDiagnostics m) -> notification m (NotLogMessage m) -> notification m (NotShowMessage m) -> notification m + (NotProgressStart m) -> notification m + (NotProgressReport m) -> notification m + (NotProgressDone m) -> notification m + (NotProgressCancel m) -> notification m (NotTelemetry m) -> notification m (NotCancelRequestFromServer m) -> notification m -- 2.30.2