Update to hie-bios 0.5.0

exe/Main.hs

@@ -50,7 +50,7 @@ import qualified System.Directory.Extra as IO
 import System.Environment
 import System.IO
 import System.Exit
-import HIE.Bios.Environment (addCmdOpts)
+import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolute)
 import Paths_ghcide
 import Development.GitRev
 import Development.Shake (Action,  action)
@@ -312,10 +312,10 @@ loadSession dir = do
             -- Modify the map so the hieYaml now maps to the newly created
             -- HscEnv
             -- Returns
-            -- * the new HscEnv so it can be used to modify the
+            --  * the new HscEnv so it can be used to modify the
             --   FilePath -> HscEnv map
-            -- * The information for the new component which caused this cache miss
-            -- * The modified information (without -inplace flags) for
+            --  * The information for the new component which caused this cache miss
+            --  * The modified information (without -inplace flags) for
             --   existing packages
             pure (Map.insert hieYaml (newHscEnv, new_deps) m, (newHscEnv, head new_deps', tail new_deps'))
 
@@ -489,9 +489,10 @@ memoIO op = do
             Just res -> return (mp, res)
 
 setOptions :: GhcMonad m => ComponentOptions -> DynFlags -> m (DynFlags, [Target])
-setOptions (ComponentOptions theOpts _) dflags = do
+setOptions (ComponentOptions theOpts compRoot _) dflags = do
     cacheDir <- liftIO $ getCacheDir theOpts
-    (dflags', targets) <- addCmdOpts theOpts dflags
+    (dflags_, targets) <- addCmdOpts theOpts dflags
+    let dflags' = makeDynFlagsAbsolute compRoot dflags_
     let dflags'' =
           -- disabled, generated directly by ghcide instead
           flip gopt_unset Opt_WriteInterface $

ghcide.cabal

@@ -217,7 +217,7 @@ executable ghcide
         hashable,
         haskell-lsp,
         haskell-lsp-types,
-        hie-bios >= 0.4.0 && < 0.5,
+        hie-bios >= 0.5.0 && < 0.6,
         ghcide,
         optparse-applicative,
         shake,

stack-ghc-lib.yaml

@@ -5,7 +5,7 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.10.3.0
-- hie-bios-0.4.0
+- hie-bios-0.5.0
 - ghc-lib-parser-8.8.1
 - ghc-lib-8.8.1
 - fuzzy-0.1.0.0

stack.yaml

@@ -5,7 +5,7 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - lsp-test-0.10.3.0
-- hie-bios-0.4.0
+- hie-bios-0.5.0
 - fuzzy-0.1.0.0
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-base-0.94.0.0

stack810.yaml

@@ -9,7 +9,7 @@ extra-deps:
 - lsp-test-0.10.2.0
 - ghc-check-0.1.0.3
 - opentelemetry-0.3.2
-
+- hie-bios-0.5.0
 # for ghc-8.10
 - Cabal-3.2.0.0
 - lens-4.19.1

stack84.yaml

@@ -11,7 +11,7 @@ extra-deps:
 - rope-utf16-splay-0.3.1.0
 - filepattern-0.1.1
 - js-dgtable-0.5.2
-- hie-bios-0.4.0
+- hie-bios-0.5.0
 - fuzzy-0.1.0.0
 - shake-0.18.5
 - time-compat-1.9.2.2

stack88.yaml

@@ -7,5 +7,6 @@ extra-deps:
 - lsp-test-0.10.3.0
 - ghc-check-0.3.0.1
 - opentelemetry-0.3.2
+- hie-bios-0.5.0
 nix:
   packages: [zlib]