From 8d2d3920e57f17b1cf9400c9a3b667a8721583d4 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 18 May 2019 13:56:14 +0200 Subject: [PATCH 1/5] Bump haskell-lsp to 0.13.0.0 Which makes the liquidhaskell hover messages render better. --- haskell-ide-engine.cabal | 8 ++++---- hie-plugin-api/hie-plugin-api.cabal | 2 +- stack-8.2.1.yaml | 6 +++--- stack-8.2.2.yaml | 6 +++--- stack-8.4.2.yaml | 6 +++--- stack-8.4.3.yaml | 6 +++--- stack-8.4.4.yaml | 6 +++--- stack-8.6.1.yaml | 6 +++--- stack-8.6.2.yaml | 6 +++--- stack-8.6.3.yaml | 6 +++--- stack-8.6.4.yaml | 6 +++--- stack-8.6.5.yaml | 6 +++--- stack.yaml | 6 +++--- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index a36f8747b..0b3f4c0b7 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -70,8 +70,8 @@ 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 @@ -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..443f9935c 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 - hlint-2.0.11 - hsimport-0.8.8 -- lsp-test-0.5.2.2 +- lsp-test-0.5.2.2@rev:1 - 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..5f7ba7c24 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 - 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.2@rev:1 - 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..2f9b6ed15 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 - 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.2@rev:1 - 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..e088f49ea 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 - 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.2@rev:1 - 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..30ce889ac 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.2@rev:1 - 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..a80d579bd 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.2@rev:1 - 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..9e9459b59 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.2@rev:1 - 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..fcfe2439e 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.2@rev:1 - 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..ea76b2932 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.2@rev:1 - 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..3e89e723f 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.2@rev:1 - 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..3e89e723f 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.2@rev:1 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 From b8f00971cdcaa18d8c04204a65c689edc9031736 Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 18 May 2019 14:14:01 +0200 Subject: [PATCH 2/5] Use haskell-lsp-types-0.13 at rev2 Which relaxes the aeson constraint to what is actually needed. --- stack-8.2.1.yaml | 2 +- stack-8.2.2.yaml | 2 +- stack-8.4.2.yaml | 2 +- stack-8.4.3.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index 443f9935c..7c4dfa11b 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -21,7 +21,7 @@ extra-deps: - haddock-api-2.18.1 - haddock-library-1.4.4 - haskell-lsp-0.13.0.0 -- haskell-lsp-types-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@rev:1 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index 5f7ba7c24..f2b396a50 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -22,7 +22,7 @@ extra-deps: - haddock-api-2.18.1 - haddock-library-1.4.4 - haskell-lsp-0.13.0.0 -- haskell-lsp-types-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 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 2f9b6ed15..dba711144 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -20,7 +20,7 @@ extra-deps: - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.13.0.0 -- haskell-lsp-types-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 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index e088f49ea..daa782f26 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -19,7 +19,7 @@ extra-deps: - haddock-api-2.20.0 - haddock-library-1.6.0 - haskell-lsp-0.13.0.0 -- haskell-lsp-types-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 From d99ed4c6c7c8000dce49a4044c085e370f9c921b Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 18 May 2019 17:50:50 +0200 Subject: [PATCH 3/5] Fix hover tests --- test/functional/HoverSpec.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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." From 719f0659131a9db8ce11294e97217da2028706dc Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 18 May 2019 17:56:52 +0200 Subject: [PATCH 4/5] Use bumped lsp-test Which does not need a revision annotation --- stack-8.2.1.yaml | 2 +- stack-8.2.2.yaml | 2 +- stack-8.4.2.yaml | 2 +- stack-8.4.3.yaml | 2 +- stack-8.4.4.yaml | 2 +- stack-8.6.1.yaml | 2 +- stack-8.6.2.yaml | 2 +- stack-8.6.3.yaml | 2 +- stack-8.6.4.yaml | 2 +- stack-8.6.5.yaml | 2 +- stack.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index 7c4dfa11b..f2fb89041 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -24,7 +24,7 @@ extra-deps: - haskell-lsp-types-0.13.0.0@rev:2 - hlint-2.0.11 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 f2b396a50..ab1aa3884 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -28,7 +28,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 dba711144..00c9ed88b 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -26,7 +26,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 daa782f26..653ba7804 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -25,7 +25,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 30ce889ac..e71718ccb 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -25,7 +25,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 a80d579bd..a99bf85c5 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -27,7 +27,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 9e9459b59..6d7b3a4c7 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -23,7 +23,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 fcfe2439e..04bb340b9 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -23,7 +23,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 ea76b2932..588e9f89f 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -22,7 +22,7 @@ extra-deps: - hlint-2.1.17 - hoogle-5.0.17.6 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 3e89e723f..439f8ed4d 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -23,7 +23,7 @@ extra-deps: - haskell-lsp-types-0.13.0.0 - hlint-2.1.17 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- 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 3e89e723f..439f8ed4d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,7 +23,7 @@ extra-deps: - haskell-lsp-types-0.13.0.0 - hlint-2.1.17 - hsimport-0.8.8 -- lsp-test-0.5.2.2@rev:1 +- lsp-test-0.5.2.3 - monad-dijkstra-0.1.1.2@rev:1 - monad-memo-0.4.1 - multistate-0.8.0.1 From 8afc5a6ef1f6bbfb02df545a76deb838ea82ee9d Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Sat, 18 May 2019 19:08:21 +0200 Subject: [PATCH 5/5] Put upper limit on hlint pending segfault resolution Gory details are at https://github.com/ndmitchell/hlint/issues/637, as triggered by https://github.com/alanz/haskell-ide-engine/commit/0d4496dfeaa3bc85efb558def03d0f22e704b483 --- haskell-ide-engine.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index 0b3f4c0b7..3cdea5830 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -74,7 +74,7 @@ library , 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