From e7a888628391e9b245c61e1a5a01c4965ab0396f Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Sun, 28 Apr 2019 20:15:27 +0100 Subject: [PATCH] Update haskell-lsp bounds --- lsp-test.cabal | 6 +++--- src/Language/Haskell/LSP/Test/Decoding.hs | 1 - src/Language/Haskell/LSP/Test/Messages.hs | 2 +- stack.yaml | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lsp-test.cabal b/lsp-test.cabal index f5822d9..947aadd 100644 --- a/lsp-test.cabal +++ b/lsp-test.cabal @@ -1,5 +1,5 @@ name: lsp-test -version: 0.5.1.3 +version: 0.5.1.4 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.10 && < 0.11 + , haskell-lsp == 0.11.* , aeson , aeson-pretty , ansi-terminal @@ -78,7 +78,7 @@ test-suite tests build-depends: base >= 4.10 && < 5 , hspec , lens - , haskell-lsp >= 0.10 && < 0.11 + , haskell-lsp >= 0.10 && < 0.12 , lsp-test , data-default , aeson diff --git a/src/Language/Haskell/LSP/Test/Decoding.hs b/src/Language/Haskell/LSP/Test/Decoding.hs index 43810bb..337dee3 100644 --- a/src/Language/Haskell/LSP/Test/Decoding.hs +++ b/src/Language/Haskell/LSP/Test/Decoding.hs @@ -134,7 +134,6 @@ decodeFromServerMsg reqMap 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 258f91b..1a3805f 100644 --- a/src/Language/Haskell/LSP/Test/Messages.hs +++ b/src/Language/Haskell/LSP/Test/Messages.hs @@ -93,7 +93,6 @@ handleServerMessage request response notification msg = case msg of (NotProgressStart m) -> notification m (NotProgressReport m) -> notification m (NotProgressDone m) -> notification m - (NotProgressCancel m) -> notification m (NotTelemetry m) -> notification m (NotCancelRequestFromServer m) -> notification m @@ -145,4 +144,5 @@ handleClientMessage request response notification msg = case msg of (NotDidSaveTextDocument m) -> notification m (NotDidChangeWatchedFiles m) -> notification m (NotDidChangeWorkspaceFolders m) -> notification m + (NotProgressCancel m) -> notification m (UnknownFromClientMessage m) -> error $ "Unknown message sent from client: " ++ show m diff --git a/stack.yaml b/stack.yaml index 57f3658..be001f8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,5 +3,5 @@ packages: - . extra-deps: - - haskell-lsp-0.10.0.0 - - haskell-lsp-types-0.10.0.0 + - haskell-lsp-0.11.0.0 + - haskell-lsp-types-0.11.0.0 -- 2.30.2