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

Use haskell-lsp-0.20 #1645

Merged
merged 4 commits into from
Feb 6, 2020
Merged

Use haskell-lsp-0.20 #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c25c73
Bump up haskell-lsp version
jneira Feb 5, 2020
33bcbdd
Use lsp-0.20 for ghc-8.8.1
jneira Feb 6, 2020
2ee0aa2
Fix ToJSON instance for Diagnostics
jneira Feb 6, 2020
2aa40be
Bump up lsp-test to 0.10.1.0
jneira Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ constraints:

write-ghc-environment-files: never

index-state: 2020-02-02T17:43:42Z
index-state: 2020-02-05T07:49:28Z
10 changes: 5 additions & 5 deletions haskell-ide-engine.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ library
, gitrev >= 1.1
, haddock-api
, haddock-library
, haskell-lsp == 0.19.*
, haskell-lsp-types == 0.19.*
, haskell-lsp == 0.20.*
, haskell-lsp-types == 0.20.*
, haskell-src-exts
, hie-plugin-api >= 1.1
, hoogle >= 5.0.13
Expand Down Expand Up @@ -219,7 +219,7 @@ test-suite unit-test
, free
, ghc
, haskell-ide-engine
, haskell-lsp-types == 0.19.*
, haskell-lsp-types == 0.20.*
, hie-bios
, hie-test-utils
, hie-plugin-api
Expand Down Expand Up @@ -312,8 +312,8 @@ test-suite func-test
, filepath
, lsp-test >= 0.10.0.0
, haskell-ide-engine
, haskell-lsp-types == 0.19.*
, haskell-lsp == 0.19.*
, haskell-lsp-types == 0.20.*
, haskell-lsp == 0.20.*
, hie-test-utils
, hie-plugin-api
, hspec
Expand Down
4 changes: 2 additions & 2 deletions hie-plugin-api/Haskell/Ide/Engine/Ghc.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import qualified Data.Map.Strict as Map
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Data.Aeson
import Data.Coerce
import ErrUtils

import Haskell.Ide.Engine.MonadFunctions
Expand Down Expand Up @@ -73,7 +72,8 @@ instance Monoid Diagnostics where

instance Data.Aeson.ToJSON Diagnostics where
toJSON (Diagnostics d) = Data.Aeson.toJSON
(Map.mapKeys coerce d :: Map.Map T.Text (Set.Set Diagnostic))
(Map.mapKeys extractUri d :: Map.Map T.Text (Set.Set Diagnostic))
where extractUri (NormalizedUri _ t) = t

type AdditionalErrs = [T.Text]

Expand Down
2 changes: 1 addition & 1 deletion hie-plugin-api/hie-plugin-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ library
, ghc
, hie-bios
, cabal-helper
, haskell-lsp == 0.19.*
, haskell-lsp == 0.20.*
, hslogger
, unliftio
, monad-control
Expand Down
6 changes: 3 additions & 3 deletions stack-8.4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ extra-deps:
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.20.0
- haddock-library-1.6.0
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
Expand All @@ -39,7 +39,7 @@ extra-deps:
- invariant-0.5.3
- lens-4.18.1
- libyaml-0.1.1.0
- lsp-test-0.10.0.0
- lsp-test-0.10.1.0
- microlens-th-0.4.3.2
- monad-dijkstra-0.1.1.2
- network-3.1.1.1 # for hslogger
Expand Down
6 changes: 3 additions & 3 deletions stack-8.4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ extra-deps:
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.20.0
- haddock-library-1.6.0
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
Expand All @@ -49,7 +49,7 @@ extra-deps:
- invariant-0.5.3
- lens-4.18.1
- libyaml-0.1.1.1
- lsp-test-0.10.0.0
- lsp-test-0.10.1.0
- microlens-th-0.4.3.4
- monad-dijkstra-0.1.1.2
- network-3.1.1.1 # for hslogger
Expand Down
6 changes: 3 additions & 3 deletions stack-8.4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ extra-deps:
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.20.0
- haddock-library-1.6.0
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- haskell-src-exts-util-0.2.5
- hie-bios-0.4.0
Expand All @@ -38,7 +38,7 @@ extra-deps:
- invariant-0.5.3
- lens-4.18.1
- libyaml-0.1.1.0
- lsp-test-0.10.0.0
- lsp-test-0.10.1.0
- microlens-th-0.4.3.2
- monad-dijkstra-0.1.1.2
- network-3.1.1.1 # for hslogger
Expand Down
6 changes: 3 additions & 3 deletions stack-8.6.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ extra-deps:
- ghc-lib-parser-8.8.2
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.22.0
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.10
- hoogle-5.0.17.11
- hsimport-0.11.0
- lsp-test-0.10.0.0
- lsp-test-0.10.1.0
- monad-dijkstra-0.1.1.2@rev:1
- monad-memo-0.4.1
- multistate-0.8.0.1
Expand Down
7 changes: 4 additions & 3 deletions stack-8.6.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ extra-deps:
- ghc-lib-parser-8.8.2
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.22.0
- haskell-lsp-0.19.0.0
- haskell-lsp-types-0.19.0.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- hie-bios-0.4.0
- hlint-2.2.10
- hoogle-5.0.17.11
- hsimport-0.11.0
- indexed-profunctors-0.1
- lsp-test-0.10.0.0
- lsp-test-0.10.1.0
- monad-dijkstra-0.1.1.2
- optics-core-0.2
- optparse-applicative-0.15.1.0
Expand All @@ -38,6 +38,7 @@ extra-deps:
- semialign-1.1
- temporary-1.2.1.1
- topograph-1

flags:
haskell-ide-engine:
pedantic: true
Expand Down
3 changes: 3 additions & 0 deletions stack-8.8.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ extra-deps:
- ghc-lib-parser-ex-8.8.4.0
- haddock-api-2.23.0
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.10
Expand Down
3 changes: 3 additions & 0 deletions stack-8.8.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ extra-deps:
- haddock-api
# - haddock-api-2.23.0
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.10
Expand Down
3 changes: 3 additions & 0 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ extra-deps:
- haddock-api
# - haddock-api-2.23.0
- haddock-library-1.8.0
- haskell-lsp-0.20.0.0
- haskell-lsp-types-0.20.0.0
- lsp-test-0.10.1.0
- haskell-src-exts-1.21.1
- hie-bios-0.4.0
- hlint-2.2.10
Expand Down