From 59380ca81c003f777fdfd48b92fbe873474fb9a8 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Sun, 5 May 2019 22:10:09 +0100 Subject: [PATCH] Update haskell-lsp --- lsp-test.cabal | 12 ++++++------ src/Language/Haskell/LSP/Test.hs | 2 +- stack.yaml | 7 ++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lsp-test.cabal b/lsp-test.cabal index a55bc40..7997540 100644 --- a/lsp-test.cabal +++ b/lsp-test.cabal @@ -1,5 +1,5 @@ name: lsp-test -version: 0.5.2.0 +version: 0.5.2.1 synopsis: Functional test framework for LSP servers. description: A test framework for writing tests against @@ -21,11 +21,11 @@ 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 +tested-with: GHC == 8.2.2 , GHC == 8.4.2 , GHC == 8.4.3, GHC == 8.6.4, GHC == 8.6.5 source-repository head type: git - location: https://github.com/bubba/haskell-lsp-test/ + location: https://github.com/bubba/lsp-test/ library hs-source-dirs: src @@ -36,7 +36,7 @@ library , parser-combinators:Control.Applicative.Combinators default-language: Haskell2010 build-depends: base >= 4.10 && < 5 - , haskell-lsp == 0.11.* + , haskell-lsp == 0.12.* , aeson , aeson-pretty , ansi-terminal @@ -52,10 +52,10 @@ library , mtl , parser-combinators , process + , rope-utf16-splay , text , transformers , unordered-containers - , yi-rope if os(windows) build-depends: Win32 else @@ -78,7 +78,7 @@ test-suite tests build-depends: base >= 4.10 && < 5 , hspec , lens - , haskell-lsp == 0.11.* + , haskell-lsp == 0.12.* , lsp-test , data-default , aeson diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs index 4a1936d..696f84a 100644 --- a/src/Language/Haskell/LSP/Test.hs +++ b/src/Language/Haskell/LSP/Test.hs @@ -108,7 +108,7 @@ import Language.Haskell.LSP.Test.Server import System.IO import System.Directory import System.FilePath -import qualified Yi.Rope as Rope +import qualified Data.Rope.UTF16 as Rope -- | Starts a new session. -- diff --git a/stack.yaml b/stack.yaml index be001f8..90c3122 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,8 @@ -resolver: lts-13.15 +resolver: nightly-2019-05-05 packages: - . extra-deps: - - haskell-lsp-0.11.0.0 - - haskell-lsp-types-0.11.0.0 + - haskell-lsp-0.12.0.0 + - haskell-lsp-types-0.12.0.0 + - rope-utf16-splay-0.2.0.0 -- 2.30.2