diff --git a/cabal.project b/cabal.project index b1f8ec131..cbe2086b9 100644 --- a/cabal.project +++ b/cabal.project @@ -15,4 +15,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-02-02T17:43:42Z +index-state: 2020-02-05T07:49:28Z diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index ce3b2b967..b801f7c2d 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -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 @@ -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 @@ -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 diff --git a/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs b/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs index e40514b30..d819b5815 100644 --- a/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs +++ b/hie-plugin-api/Haskell/Ide/Engine/Ghc.hs @@ -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 @@ -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] diff --git a/hie-plugin-api/hie-plugin-api.cabal b/hie-plugin-api/hie-plugin-api.cabal index 2265d7029..691839c44 100644 --- a/hie-plugin-api/hie-plugin-api.cabal +++ b/hie-plugin-api/hie-plugin-api.cabal @@ -54,7 +54,7 @@ library , ghc , hie-bios , cabal-helper - , haskell-lsp == 0.19.* + , haskell-lsp == 0.20.* , hslogger , unliftio , monad-control diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index 40466aa9f..ecd86545c 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -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 @@ -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 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 8b9a41a0d..ea534dbf4 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -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 @@ -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 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index 82de37511..50f15caa4 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -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 @@ -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 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index aab19aa5f..2fab67abb 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -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 diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 284298dff..e8a77c1e3 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -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 @@ -38,6 +38,7 @@ extra-deps: - semialign-1.1 - temporary-1.2.1.1 - topograph-1 + flags: haskell-ide-engine: pedantic: true diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml index f7406c436..53441bb5a 100644 --- a/stack-8.8.1.yaml +++ b/stack-8.8.1.yaml @@ -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 diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index 6139467ba..3037a3d81 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -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 diff --git a/stack.yaml b/stack.yaml index 6139467ba..3037a3d81 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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