Merge branch 'github-actions' of https://github.com/bubba/lsp-test into github-actions

diff --git a/ChangeLog.md b/ChangeLog.md
index a0c18566657f1ae58ff93333aed33cc5a9e0f99f..8bbc01f8b7f8412b4d6659c9085295eb8b2e439b 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for lsp-test
 
+## 0.7.0.0 -- 2019-09-08
+
+* Update for haskell-lsp-0.16.0.0
+
 ## 0.6.1.0 -- 2019-08-24
 
 * Add `satisfyMaybe` (@cocreature)

diff --git a/lsp-test.cabal b/lsp-test.cabal
index e4c465b052ff312794aa3f387564dd388d44f53c..14e0046a2836a42fc46709488d08763766df5fe3 100644 (file)
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@ -1,5 +1,5 @@
 name:                lsp-test
-version:             0.6.1.0
+version:             0.7.0.0
 synopsis:            Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
@@ -21,7 +21,7 @@ build-type:          Simple
 cabal-version:       2.0
 extra-source-files:  README.md
                    , ChangeLog.md
-tested-with:         GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3, GHC == 8.6.4, GHC == 8.6.5
+tested-with:         GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3, GHC == 8.6.4, GHC == 8.6.5, GHC == 8.8.1
 
 source-repository head
   type:     git
@@ -36,14 +36,14 @@ library
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
   build-depends:       base >= 4.10 && < 5
-                     , haskell-lsp == 0.15.*
+                     , haskell-lsp == 0.16.*
                      , aeson
                      , aeson-pretty
                      , ansi-terminal
                      , async
                      , bytestring
                      , conduit
-                     , conduit-parse
+                     , conduit-parse == 0.2.*
                      , containers
                      , data-default
                      , Diff
@@ -79,7 +79,7 @@ test-suite tests
   build-depends:       base >= 4.10 && < 5
                      , hspec
                      , lens
-                     , haskell-lsp == 0.15.*
+                     , haskell-lsp == 0.16.*
                      , lsp-test
                      , data-default
                      , aeson

diff --git a/src/Language/Haskell/LSP/Test/Messages.hs b/src/Language/Haskell/LSP/Test/Messages.hs
index 16813e2ce0c6c144262cd991c09de0516e712acb..f41a77b4da77466dfba087ba88dd72954b176818 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Messages.hs
+++ b/src/Language/Haskell/LSP/Test/Messages.hs
@@ -124,6 +124,7 @@ handleClientMessage request response notification msg = case msg of
  (ReqDocumentFormatting       m) -> request m
  (ReqDocumentRangeFormatting  m) -> request m
  (ReqDocumentOnTypeFormatting m) -> request m
+ (ReqPrepareRename            m) -> request m
  (ReqRename                   m) -> request m
  (ReqExecuteCommand           m) -> request m
  (ReqDocumentLink             m) -> request m

diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 8e1afa8c62e515b661576fcf43190cced7e47a15..b8286a208c8f5e5369171b87ad62802d899b485d 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -34,7 +34,7 @@ import Control.Lens hiding (List)
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Except
-#if __GLASGOW_HASKELL__ >= 806
+#if __GLASGOW_HASKELL__ == 806
 import Control.Monad.Fail
 #endif
 import Control.Monad.Trans.Reader (ReaderT, runReaderT)

diff --git a/stack.yaml b/stack.yaml
index 18275ba7de51cc0f07d88d1d6707760435fe9ef4..07b7ffcc8cb097c7d6e0b2d970d3f9bf2731ac4d 100644 (file)
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,5 +4,5 @@ packages:
 
 extra-deps:
   - rope-utf16-splay-0.3.1.0
-  - haskell-lsp-0.15.0.0
-  - haskell-lsp-types-0.15.0.0
+  - haskell-lsp-0.16.0.0
+  - haskell-lsp-types-0.16.0.0

diff --git a/stack.yaml.lock b/stack.yaml.lock
index ed043353452181788391dd684f19a1a8b1769054..e894dd7fd61bf716bf7a4c32fe4b88b110221d2f 100644 (file)
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -12,19 +12,19 @@ packages:
   original:
     hackage: rope-utf16-splay-0.3.1.0
 - completed:
-    hackage: haskell-lsp-0.15.0.0@sha256:26791d3ed01ca5be1fab16a450fec751616acac8aa87c5a3a3921aea0d2bbfc2,5260
+    hackage: haskell-lsp-0.16.0.0@sha256:6ac4b58e6caef43546a3c115f1aaaae0e23d30f0e37b8c4e94525468e9982d09,5264
     pantry-tree:
       size: 1725
-      sha256: a08c3c4f25717c54f3c0adaefb3cd054c6a0a16f4b53d01617d6fc5a2e2798b0
+      sha256: 31b245f4da5b5b844be9802bb2bfd397c90c0a50b063e5bae26648c6220aaf7f
   original:
-    hackage: haskell-lsp-0.15.0.0
+    hackage: haskell-lsp-0.16.0.0
 - completed:
-    hackage: haskell-lsp-types-0.15.0.0@sha256:75698e3af3c9c0f8494121a2bdd47bb4ccc423afb58fecfa43e9ffbcd8721b3c,2880
+    hackage: haskell-lsp-types-0.16.0.0@sha256:57729b32b1ca65d4869e1e518fa4df749d4488ec5f11e23b50c2b89417f5f211,2882
     pantry-tree:
       size: 2369
-      sha256: 04b8321fc9e60796cfecc0487f35c32208908f1ce7b7e2d75bc8347a1d91bcee
+      sha256: cc24c23f741e777b9c01ccd700af034e2258e560f5fdb271d08befd4b03196b7
   original:
-    hackage: haskell-lsp-types-0.15.0.0
+    hackage: haskell-lsp-types-0.16.0.0
 snapshots:
 - completed:
     size: 499889