Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 33d4581

Browse files
alanzalanz
authored
Merge pull request #1260 from alanz/bump-haskell-lsp
Bump haskell-lsp to 0.13.0.0
2 parents efe1660 + 8afc5a6 commit 33d4581

14 files changed

+40
-40
lines changed

‎haskell-ide-engine.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ library
7070
, gitrev >= 1.1
7171
, haddock-api
7272
, haddock-library
73-
, haskell-lsp == 0.12.*
74-
, haskell-lsp-types == 0.12.*
73+
, haskell-lsp == 0.13.*
74+
, haskell-lsp-types == 0.13.*
7575
, haskell-src-exts
7676
, hie-plugin-api
77-
, hlint >= 2.0.11
77+
, hlint >= 2.0.11 && < 2.1.18
7878
, hoogle >= 5.0.13
7979
, hsimport
8080
, hslogger
@@ -277,8 +277,8 @@ test-suite func-test
277277
, filepath
278278
, lsp-test >= 0.5.2
279279
, haskell-ide-engine
280-
, haskell-lsp-types == 0.12.*
281-
, haskell-lsp == 0.12.*
280+
, haskell-lsp-types == 0.13.*
281+
, haskell-lsp == 0.13.*
282282
, hie-test-utils
283283
, hie-plugin-api
284284
, hspec

‎hie-plugin-api/hie-plugin-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ library
4545
, ghc
4646
, ghc-mod-core >= 5.9.0.0
4747
, ghc-project-types >= 5.9.0.0
48-
, haskell-lsp == 0.12.*
48+
, haskell-lsp == 0.13.*
4949
, hslogger
5050
, monad-control
5151
, mtl

‎stack-8.2.1.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ extra-deps:
2020
- ghc-exactprint-0.5.8.2
2121
- haddock-api-2.18.1
2222
- haddock-library-1.4.4
23-
- haskell-lsp-0.12.1.0
24-
- haskell-lsp-types-0.12.1.0
23+
- haskell-lsp-0.13.0.0
24+
- haskell-lsp-types-0.13.0.0@rev:2
2525
- hlint-2.0.11
2626
- hsimport-0.8.8
27-
- lsp-test-0.5.2.2
27+
- lsp-test-0.5.2.3
2828
- monad-dijkstra-0.1.1.2
2929
- mtl-2.2.2
3030
- pretty-show-1.8.2

‎stack-8.2.2.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ extra-deps:
2121
- ghc-exactprint-0.5.8.2
2222
- haddock-api-2.18.1
2323
- haddock-library-1.4.4
24-
- haskell-lsp-0.12.1.0
25-
- haskell-lsp-types-0.12.1.0
24+
- haskell-lsp-0.13.0.0
25+
- haskell-lsp-types-0.13.0.0@rev:2
2626
- haskell-src-exts-1.21.0
2727
- haskell-src-exts-util-0.2.5
2828
- hlint-2.1.17
2929
- hoogle-5.0.17.6
3030
- hsimport-0.8.8
31-
- lsp-test-0.5.2.2
31+
- lsp-test-0.5.2.3
3232
- monad-dijkstra-0.1.1.2
3333
- pretty-show-1.8.2
3434
- rope-utf16-splay-0.3.1.0

‎stack-8.4.2.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ extra-deps:
1919
- ghc-exactprint-0.5.8.2
2020
- haddock-api-2.20.0
2121
- haddock-library-1.6.0
22-
- haskell-lsp-0.12.1.0
23-
- haskell-lsp-types-0.12.1.0
22+
- haskell-lsp-0.13.0.0
23+
- haskell-lsp-types-0.13.0.0@rev:2
2424
- haskell-src-exts-1.21.0
2525
- haskell-src-exts-util-0.2.5
2626
- hlint-2.1.17
2727
- hoogle-5.0.17.6
2828
- hsimport-0.8.8
29-
- lsp-test-0.5.2.2
29+
- lsp-test-0.5.2.3
3030
- monad-dijkstra-0.1.1.2
3131
- pretty-show-1.8.2
3232
- rope-utf16-splay-0.3.1.0

‎stack-8.4.3.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ extra-deps:
1818
- ghc-exactprint-0.5.8.2
1919
- haddock-api-2.20.0
2020
- haddock-library-1.6.0
21-
- haskell-lsp-0.12.1.0
22-
- haskell-lsp-types-0.12.1.0
21+
- haskell-lsp-0.13.0.0
22+
- haskell-lsp-types-0.13.0.0@rev:2
2323
- haskell-src-exts-1.21.0
2424
- haskell-src-exts-util-0.2.5
2525
- hlint-2.1.17
2626
- hoogle-5.0.17.6
2727
- hsimport-0.8.8
28-
- lsp-test-0.5.2.2
28+
- lsp-test-0.5.2.3
2929
- monad-dijkstra-0.1.1.2
3030
- pretty-show-1.8.2
3131
- rope-utf16-splay-0.3.1.0

‎stack-8.4.4.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ extra-deps:
1818
- ghc-exactprint-0.5.8.2
1919
- haddock-api-2.20.0
2020
- haddock-library-1.6.0
21-
- haskell-lsp-0.12.1.0
22-
- haskell-lsp-types-0.12.1.0
21+
- haskell-lsp-0.13.0.0
22+
- haskell-lsp-types-0.13.0.0
2323
- haskell-src-exts-1.21.0
2424
- haskell-src-exts-util-0.2.5
2525
- hlint-2.1.17
2626
- hoogle-5.0.17.6
2727
- hsimport-0.8.8
28-
- lsp-test-0.5.2.2
28+
- lsp-test-0.5.2.3
2929
- monad-dijkstra-0.1.1.2
3030
- optparse-simple-0.1.0
3131
- pretty-show-1.9.5

‎stack-8.6.1.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ extra-deps:
2020
- data-tree-print-0.1.0.2
2121
- floskell-0.10.0
2222
- haddock-api-2.21.0
23-
- haskell-lsp-0.12.1.0
24-
- haskell-lsp-types-0.12.1.0
23+
- haskell-lsp-0.13.0.0
24+
- haskell-lsp-types-0.13.0.0
2525
- haskell-src-exts-1.21.0
2626
- haskell-src-exts-util-0.2.5
2727
- hlint-2.1.17
2828
- hoogle-5.0.17.6
2929
- hsimport-0.8.8
30-
- lsp-test-0.5.2.2
30+
- lsp-test-0.5.2.3
3131
- monad-dijkstra-0.1.1.2
3232
- monad-memo-0.4.1
3333
- monoid-subclasses-0.4.6.1

‎stack-8.6.2.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ extra-deps:
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
1818
- haddock-api-2.21.0
19-
- haskell-lsp-0.12.1.0
20-
- haskell-lsp-types-0.12.1.0
19+
- haskell-lsp-0.13.0.0
20+
- haskell-lsp-types-0.13.0.0
2121
- haskell-src-exts-1.21.0
2222
- haskell-src-exts-util-0.2.5
2323
- hlint-2.1.17
2424
- hoogle-5.0.17.6
2525
- hsimport-0.8.8
26-
- lsp-test-0.5.2.2
26+
- lsp-test-0.5.2.3
2727
- monad-dijkstra-0.1.1.2
2828
- monad-memo-0.4.1
2929
- multistate-0.8.0.1

‎stack-8.6.3.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ extra-deps:
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
1818
- haddock-api-2.21.0
19-
- haskell-lsp-0.12.1.0
20-
- haskell-lsp-types-0.12.1.0
19+
- haskell-lsp-0.13.0.0
20+
- haskell-lsp-types-0.13.0.0
2121
- haskell-src-exts-1.21.0
2222
- haskell-src-exts-util-0.2.5
2323
- hlint-2.1.17
2424
- hoogle-5.0.17.6
2525
- hsimport-0.8.8
26-
- lsp-test-0.5.2.2
26+
- lsp-test-0.5.2.3
2727
- monad-dijkstra-0.1.1.2
2828
- monad-memo-0.4.1
2929
- multistate-0.8.0.1

‎stack-8.6.4.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ extra-deps:
1616
- constrained-dynamic-0.1.0.0
1717
- floskell-0.10.0
1818
- haddock-api-2.22.0
19-
- haskell-lsp-0.12.1.0
20-
- haskell-lsp-types-0.12.1.0
19+
- haskell-lsp-0.13.0.0
20+
- haskell-lsp-types-0.13.0.0
2121
- haskell-src-exts-1.21.0
2222
- hlint-2.1.17
2323
- hoogle-5.0.17.6
2424
- hsimport-0.8.8
25-
- lsp-test-0.5.2.2
25+
- lsp-test-0.5.2.3
2626
- monad-dijkstra-0.1.1.2@rev:1
2727
- monad-memo-0.4.1
2828
- multistate-0.8.0.1

‎stack-8.6.5.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ extra-deps:
1919
- floskell-0.10.0
2020
- ghc-exactprint-0.5.8.2
2121
- haddock-api-2.22.0
22-
- haskell-lsp-0.12.1.0
23-
- haskell-lsp-types-0.12.1.0
22+
- haskell-lsp-0.13.0.0
23+
- haskell-lsp-types-0.13.0.0
2424
- hlint-2.1.17
2525
- hsimport-0.8.8
26-
- lsp-test-0.5.2.2
26+
- lsp-test-0.5.2.3
2727
- monad-dijkstra-0.1.1.2@rev:1
2828
- monad-memo-0.4.1
2929
- multistate-0.8.0.1

‎stack.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ extra-deps:
1919
- floskell-0.10.0
2020
- ghc-exactprint-0.5.8.2
2121
- haddock-api-2.22.0
22-
- haskell-lsp-0.12.1.0
23-
- haskell-lsp-types-0.12.1.0
22+
- haskell-lsp-0.13.0.0
23+
- haskell-lsp-types-0.13.0.0
2424
- hlint-2.1.17
2525
- hsimport-0.8.8
26-
- lsp-test-0.5.2.2
26+
- lsp-test-0.5.2.3
2727
- monad-dijkstra-0.1.1.2@rev:1
2828
- monad-memo-0.4.1
2929
- multistate-0.8.0.1

‎test/functional/HoverSpec.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec = describe "hover" $
2121
h ^. range `shouldBe` Just (Range (Position 1 16) (Position 1 19))
2222
let
2323
hasType (HoverContents (MarkupContent MkMarkdown s))
24-
= "```haskell\nsum :: [Int] -> Int\n```" `T.isPrefixOf`s
24+
= "\n```haskell\nsum :: [Int] -> Int\n```" `T.isPrefixOf`s
2525
hasType _ = False
2626

2727
sumDoc = "The `sum` function computes the sum of the numbers of a structure."

0 commit comments

Comments
 (0)