diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index a36f8747b..3cdea5830 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -70,11 +70,11 @@ library , gitrev >= 1.1 , haddock-api , haddock-library - , haskell-lsp == 0.12.* - , haskell-lsp-types == 0.12.* + , haskell-lsp == 0.13.* + , haskell-lsp-types == 0.13.* , haskell-src-exts , hie-plugin-api - , hlint >= 2.0.11 + , hlint >= 2.0.11 && < 2.1.18 , hoogle >= 5.0.13 , hsimport , hslogger @@ -277,8 +277,8 @@ test-suite func-test , filepath , lsp-test >= 0.5.2 , haskell-ide-engine - , haskell-lsp-types == 0.12.* - , haskell-lsp == 0.12.* + , haskell-lsp-types == 0.13.* + , haskell-lsp == 0.13.* , hie-test-utils , hie-plugin-api , hspec diff --git a/hie-plugin-api/hie-plugin-api.cabal b/hie-plugin-api/hie-plugin-api.cabal index b099764c8..c33932f93 100644 --- a/hie-plugin-api/hie-plugin-api.cabal +++ b/hie-plugin-api/hie-plugin-api.cabal @@ -45,7 +45,7 @@ library , ghc , ghc-mod-core >= 5.9.0.0 , ghc-project-types >= 5.9.0.0 - , haskell-lsp == 0.12.* + , haskell-lsp == 0.13.* , hslogger , monad-control , mtl diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index b7cad11a4..f2fb89041 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -20,11 +20,11 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0@rev:2 - hlint-2.0.11 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - mtl-2.2.2 - pretty-show-1.8.2 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index 5eb7eed62..ab1aa3884 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -21,14 +21,14 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0@rev:2 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 22c2be88e..00c9ed88b 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -19,14 +19,14 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0@rev:2 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 12830ad96..653ba7804 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -18,14 +18,14 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0@rev:2 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - pretty-show-1.8.2 - rope-utf16-splay-0.3.1.0 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 09605096c..e71718ccb 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -18,14 +18,14 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - optparse-simple-0.1.0 - pretty-show-1.9.5 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 7e5b261cf..a99bf85c5 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -20,14 +20,14 @@ extra-deps: - data-tree-print-0.1.0.2 - floskell-0.10.0 - haddock-api-2.21.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - monoid-subclasses-0.4.6.1 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index 414af8acf..6d7b3a4c7 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -16,14 +16,14 @@ extra-deps: - constrained-dynamic-0.1.0.0 - floskell-0.10.0 - haddock-api-2.21.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index f0126ce4e..04bb340b9 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -16,14 +16,14 @@ extra-deps: - constrained-dynamic-0.1.0.0 - floskell-0.10.0 - haddock-api-2.21.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - haskell-src-exts-1.21.0 - haskell-src-exts-util-0.2.5 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 9bc25f676..588e9f89f 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -16,13 +16,13 @@ extra-deps: - constrained-dynamic-0.1.0.0 - floskell-0.10.0 - haddock-api-2.22.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - haskell-src-exts-1.21.0 - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 29017335e..439f8ed4d 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -19,11 +19,11 @@ extra-deps: - floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.22.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - hlint-2.1.17 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/stack.yaml b/stack.yaml index 29017335e..439f8ed4d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -19,11 +19,11 @@ extra-deps: - floskell-0.10.0 - ghc-exactprint-0.5.8.2 - haddock-api-2.22.0 -- haskell-lsp-0.12.1.0 -- haskell-lsp-types-0.12.1.0 +- haskell-lsp-0.13.0.0 +- haskell-lsp-types-0.13.0.0 - hlint-2.1.17 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 diff --git a/test/functional/HoverSpec.hs b/test/functional/HoverSpec.hs index d78950124..f3553c17a 100644 --- a/test/functional/HoverSpec.hs +++ b/test/functional/HoverSpec.hs @@ -21,7 +21,7 @@ spec = describe "hover" $ h ^. range `shouldBe` Just (Range (Position 1 16) (Position 1 19)) let hasType (HoverContents (MarkupContent MkMarkdown s)) - = "```haskell\nsum :: [Int] -> Int\n```" `T.isPrefixOf`s + = "\n```haskell\nsum :: [Int] -> Int\n```" `T.isPrefixOf`s hasType _ = False sumDoc = "The `sum` function computes the sum of the numbers of a structure."