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

Commit 49c6185

Browse files
authored
Merge pull request #1645 from jneira/haskell-lsp-0.20
Use haskell-lsp-0.20
2 parents 7283ae2 + 2aa40be commit 49c6185

File tree

12 files changed

+34
-24
lines changed

12 files changed

+34
-24
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ constraints:
1515

1616
write-ghc-environment-files: never
1717

18-
index-state: 2020-02-02T17:43:42Z
18+
index-state: 2020-02-05T07:49:28Z

haskell-ide-engine.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ library
7373
, gitrev >= 1.1
7474
, haddock-api
7575
, haddock-library
76-
, haskell-lsp == 0.19.*
77-
, haskell-lsp-types == 0.19.*
76+
, haskell-lsp == 0.20.*
77+
, haskell-lsp-types == 0.20.*
7878
, haskell-src-exts
7979
, hie-plugin-api >= 1.1
8080
, hoogle >= 5.0.13
@@ -219,7 +219,7 @@ test-suite unit-test
219219
, free
220220
, ghc
221221
, haskell-ide-engine
222-
, haskell-lsp-types == 0.19.*
222+
, haskell-lsp-types == 0.20.*
223223
, hie-bios
224224
, hie-test-utils
225225
, hie-plugin-api
@@ -312,8 +312,8 @@ test-suite func-test
312312
, filepath
313313
, lsp-test >= 0.10.0.0
314314
, haskell-ide-engine
315-
, haskell-lsp-types == 0.19.*
316-
, haskell-lsp == 0.19.*
315+
, haskell-lsp-types == 0.20.*
316+
, haskell-lsp == 0.20.*
317317
, hie-test-utils
318318
, hie-plugin-api
319319
, hspec

hie-plugin-api/Haskell/Ide/Engine/Ghc.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import qualified Data.Map.Strict as Map
2626
import qualified Data.Set as Set
2727
import qualified Data.Text as T
2828
import qualified Data.Aeson
29-
import Data.Coerce
3029
import ErrUtils
3130

3231
import Haskell.Ide.Engine.MonadFunctions
@@ -73,7 +72,8 @@ instance Monoid Diagnostics where
7372

7473
instance Data.Aeson.ToJSON Diagnostics where
7574
toJSON (Diagnostics d) = Data.Aeson.toJSON
76-
(Map.mapKeys coerce d :: Map.Map T.Text (Set.Set Diagnostic))
75+
(Map.mapKeys extractUri d :: Map.Map T.Text (Set.Set Diagnostic))
76+
where extractUri (NormalizedUri _ t) = t
7777

7878
type AdditionalErrs = [T.Text]
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ library
5454
, ghc
5555
, hie-bios
5656
, cabal-helper
57-
, haskell-lsp == 0.19.*
57+
, haskell-lsp == 0.20.*
5858
, hslogger
5959
, unliftio
6060
, monad-control

stack-8.4.2.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ extra-deps:
2727
- ghc-lib-parser-ex-8.8.4.0
2828
- haddock-api-2.20.0
2929
- haddock-library-1.6.0
30-
- haskell-lsp-0.19.0.0
31-
- haskell-lsp-types-0.19.0.0
30+
- haskell-lsp-0.20.0.0
31+
- haskell-lsp-types-0.20.0.0
3232
- haskell-src-exts-1.21.1
3333
- haskell-src-exts-util-0.2.5
3434
- hie-bios-0.4.0
@@ -39,7 +39,7 @@ extra-deps:
3939
- invariant-0.5.3
4040
- lens-4.18.1
4141
- libyaml-0.1.1.0
42-
- lsp-test-0.10.0.0
42+
- lsp-test-0.10.1.0
4343
- microlens-th-0.4.3.2
4444
- monad-dijkstra-0.1.1.2
4545
- network-3.1.1.1 # for hslogger

stack-8.4.3.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ extra-deps:
3333
- ghc-lib-parser-ex-8.8.4.0
3434
- haddock-api-2.20.0
3535
- haddock-library-1.6.0
36-
- haskell-lsp-0.19.0.0
37-
- haskell-lsp-types-0.19.0.0
36+
- haskell-lsp-0.20.0.0
37+
- haskell-lsp-types-0.20.0.0
3838
- haskell-src-exts-1.21.1
3939
- haskell-src-exts-util-0.2.5
4040
- hie-bios-0.4.0
@@ -49,7 +49,7 @@ extra-deps:
4949
- invariant-0.5.3
5050
- lens-4.18.1
5151
- libyaml-0.1.1.1
52-
- lsp-test-0.10.0.0
52+
- lsp-test-0.10.1.0
5353
- microlens-th-0.4.3.4
5454
- monad-dijkstra-0.1.1.2
5555
- network-3.1.1.1 # for hslogger

stack-8.4.4.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extra-deps:
2626
- ghc-lib-parser-ex-8.8.4.0
2727
- haddock-api-2.20.0
2828
- haddock-library-1.6.0
29-
- haskell-lsp-0.19.0.0
30-
- haskell-lsp-types-0.19.0.0
29+
- haskell-lsp-0.20.0.0
30+
- haskell-lsp-types-0.20.0.0
3131
- haskell-src-exts-1.21.1
3232
- haskell-src-exts-util-0.2.5
3333
- hie-bios-0.4.0
@@ -38,7 +38,7 @@ extra-deps:
3838
- invariant-0.5.3
3939
- lens-4.18.1
4040
- libyaml-0.1.1.0
41-
- lsp-test-0.10.0.0
41+
- lsp-test-0.10.1.0
4242
- microlens-th-0.4.3.2
4343
- monad-dijkstra-0.1.1.2
4444
- network-3.1.1.1 # for hslogger

stack-8.6.4.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ extra-deps:
2020
- ghc-lib-parser-8.8.2
2121
- ghc-lib-parser-ex-8.8.4.0
2222
- haddock-api-2.22.0
23-
- haskell-lsp-0.19.0.0
24-
- haskell-lsp-types-0.19.0.0
23+
- haskell-lsp-0.20.0.0
24+
- haskell-lsp-types-0.20.0.0
2525
- haskell-src-exts-1.21.1
2626
- hie-bios-0.4.0
2727
- hlint-2.2.10
2828
- hoogle-5.0.17.11
2929
- hsimport-0.11.0
30-
- lsp-test-0.10.0.0
30+
- lsp-test-0.10.1.0
3131
- monad-dijkstra-0.1.1.2@rev:1
3232
- monad-memo-0.4.1
3333
- multistate-0.8.0.1

stack-8.6.5.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ extra-deps:
2222
- ghc-lib-parser-8.8.2
2323
- ghc-lib-parser-ex-8.8.4.0
2424
- haddock-api-2.22.0
25-
- haskell-lsp-0.19.0.0
26-
- haskell-lsp-types-0.19.0.0
25+
- haskell-lsp-0.20.0.0
26+
- haskell-lsp-types-0.20.0.0
2727
- hie-bios-0.4.0
2828
- hlint-2.2.10
2929
- hoogle-5.0.17.11
3030
- hsimport-0.11.0
3131
- indexed-profunctors-0.1
32-
- lsp-test-0.10.0.0
32+
- lsp-test-0.10.1.0
3333
- monad-dijkstra-0.1.1.2
3434
- optics-core-0.2
3535
- optparse-applicative-0.15.1.0
@@ -38,6 +38,7 @@ extra-deps:
3838
- semialign-1.1
3939
- temporary-1.2.1.1
4040
- topograph-1
41+
4142
flags:
4243
haskell-ide-engine:
4344
pedantic: true

stack-8.8.1.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ extra-deps:
1717
- ghc-lib-parser-ex-8.8.4.0
1818
- haddock-api-2.23.0
1919
- haddock-library-1.8.0
20+
- haskell-lsp-0.20.0.0
21+
- haskell-lsp-types-0.20.0.0
22+
- lsp-test-0.10.1.0
2023
- haskell-src-exts-1.21.1
2124
- hie-bios-0.4.0
2225
- hlint-2.2.10

0 commit comments

Comments
 (0)