From 94ae50059b3432f8c3fe904c674fa6e0ccdea21a Mon Sep 17 00:00:00 2001 From: fendor Date: Mon, 27 Jan 2020 19:56:04 +0100 Subject: [PATCH 1/2] Update to latest hie-bios --- exe/Main.hs | 3 ++- ghcide.cabal | 2 +- stack-ghc-lib.yaml | 2 +- stack.yaml | 2 +- stack84.yaml | 5 ++++- stack88.yaml | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/exe/Main.hs b/exe/Main.hs index 813b2a771..94c9190d4 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -15,6 +15,7 @@ import Control.Exception import Control.Monad.Extra import Control.Monad.IO.Class import Data.Default +import Data.Void (Void) import System.Time.Extra import Development.IDE.Core.FileStore import Development.IDE.Core.OfInterest @@ -175,7 +176,7 @@ showEvent lock (EventFileDiagnostics (toNormalizedFilePath -> file) diags) = showEvent lock e = withLock lock $ print e -cradleToSession :: Cradle -> IO HscEnvEq +cradleToSession :: Cradle Void -> IO HscEnvEq cradleToSession cradle = do cradleRes <- getCompilerOptions "" cradle opts <- case cradleRes of diff --git a/ghcide.cabal b/ghcide.cabal index ed532d656..0b8503aaa 100644 --- a/ghcide.cabal +++ b/ghcide.cabal @@ -177,7 +177,7 @@ executable ghcide ghc, gitrev, haskell-lsp, - hie-bios >= 0.3.2 && < 0.4, + hie-bios >= 0.4.0 && < 0.5, ghcide, optparse-applicative, shake, diff --git a/stack-ghc-lib.yaml b/stack-ghc-lib.yaml index abb37670e..6d8ec639e 100644 --- a/stack-ghc-lib.yaml +++ b/stack-ghc-lib.yaml @@ -5,7 +5,7 @@ extra-deps: - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 - lsp-test-0.10.0.0 -- hie-bios-0.3.2 +- hie-bios-0.4.0 - ghc-lib-parser-8.8.1 - ghc-lib-8.8.1 - fuzzy-0.1.0.0 diff --git a/stack.yaml b/stack.yaml index 77820c919..389c662a3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,7 +5,7 @@ extra-deps: - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 - lsp-test-0.10.0.0 -- hie-bios-0.3.2 +- hie-bios-0.4.0 - fuzzy-0.1.0.0 - regex-pcre-builtin-0.95.1.1.8.43 - regex-base-0.94.0.0 diff --git a/stack84.yaml b/stack84.yaml index e2c15786e..6fdc6ca7c 100644 --- a/stack84.yaml +++ b/stack84.yaml @@ -3,15 +3,18 @@ packages: - . extra-deps: +- aeson-1.4.6.0 +- base-orphans-0.8.2 - haskell-lsp-0.19.0.0 - haskell-lsp-types-0.19.0.0 - lsp-test-0.10.0.0 - rope-utf16-splay-0.3.1.0 - filepattern-0.1.1 - js-dgtable-0.5.2 -- hie-bios-0.3.2 +- hie-bios-0.4.0 - fuzzy-0.1.0.0 - shake-0.18.4 +- time-compat-1.9.2.2 - regex-base-0.94.0.0 - regex-tdfa-1.3.1.0 - parser-combinators-1.2.1 diff --git a/stack88.yaml b/stack88.yaml index 539004113..3e79428d2 100644 --- a/stack88.yaml +++ b/stack88.yaml @@ -3,6 +3,7 @@ packages: - . extra-deps: - fuzzy-0.1.0.0 +- hie-bios-0.4.0 allow-newer: true nix: packages: [zlib] From d2c0c13fadc7779f24c19d884dddf11036ca3ae9 Mon Sep 17 00:00:00 2001 From: fendor Date: Mon, 3 Feb 2020 23:51:57 +0100 Subject: [PATCH 2/2] Remove explicit usage of type parameter Void from Cradle --- exe/Main.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/exe/Main.hs b/exe/Main.hs index 94c9190d4..35692ebc9 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -15,7 +15,6 @@ import Control.Exception import Control.Monad.Extra import Control.Monad.IO.Class import Data.Default -import Data.Void (Void) import System.Time.Extra import Development.IDE.Core.FileStore import Development.IDE.Core.OfInterest @@ -176,7 +175,7 @@ showEvent lock (EventFileDiagnostics (toNormalizedFilePath -> file) diags) = showEvent lock e = withLock lock $ print e -cradleToSession :: Cradle Void -> IO HscEnvEq +cradleToSession :: Cradle a -> IO HscEnvEq cradleToSession cradle = do cradleRes <- getCompilerOptions "" cradle opts <- case cradleRes of