Upgrade to hie-bios 0.6.1

Author: fendor

.gitmodules

@@ -12,4 +12,5 @@
 	path = ghcide
 	# url = https://github.com/digital-asset/ghcide.git
 	# url = https://github.com/alanz/ghcide.git
-	url = https://github.com/wz1000/ghcide.git
+	# url = https://github.com/wz1000/ghcide.git
+	url = https://github.com/fendor/ghcide.git

cabal.project

@@ -12,4 +12,4 @@ package ghcide
 
 write-ghc-environment-files: never
 
-index-state: 2020-07-01T21:29:04Z
+index-state: 2020-07-13T21:29:04Z

exe/Main.hs

@@ -600,7 +600,7 @@ setCacheDir logger prefix hscComponents comps dflags = do
 
 
 renderCradleError :: NormalizedFilePath -> CradleError -> FileDiagnostic
-renderCradleError nfp (CradleError _ec t) =
+renderCradleError nfp (CradleError _ _ec t) =
   ideErrorWithSource (Just "cradle") (Just DsError) nfp (T.unlines (map T.pack t))
 
 -- See Note [Multi Cradle Dependency Info]

ghcide

@@ -77,7 +77,7 @@ library
     , gitrev
     , hashable
     , haskell-lsp == 0.22.*
-    , hie-bios >= 0.4
+    , hie-bios ^>= 0.6.1
     , hslogger
     , lens
     , ormolu ^>= 0.1.2

haskell-language-server.cabal

@@ -5,6 +5,7 @@
 
 module Ide.Cradle where
 
+import           Control.Applicative (optional)
 import           Control.Exception
 import           Data.Foldable (toList)
 import           Data.Function ((&))
@@ -21,7 +22,8 @@ import           Distribution.Helper (Package, projectPackages, pUnits,
                                       unChModuleName, Ex(..), ProjLoc(..),
                                       QueryEnv, mkQueryEnv, runQuery,
                                       Unit, unitInfo, uiComponents,
-                                      ChEntrypoint(..), UnitInfo(..))
+                                      ChEntrypoint(..), UnitInfo(..),
+                                      qePrograms, ghcProgram)
 import           Distribution.Helper.Discover (findProjects, getDefaultDistDir)
 import           Ide.Logger
 import           HIE.Bios as Bios
@@ -31,7 +33,7 @@ import qualified HIE.Bios.Types as Bios
 import           System.Directory (getCurrentDirectory, canonicalizePath, findExecutable)
 import           System.Exit
 import           System.FilePath
-import           System.Process (readCreateProcessWithExitCode, shell, CreateProcess(..))
+import           System.Process (readCreateProcessWithExitCode, shell, CreateProcess(..), proc)
 
 
 -- ---------------------------------------------------------------------
@@ -470,6 +472,7 @@ cabalHelperCradle file = do
                                           , componentRoot = cwd
                                           , componentDependencies = []
                                           }
+                                , runGhcCmd = \args -> Bios.readProcessWithCwd cwd "ghc" args ""
                                 }
                }
     Just (Ex proj) -> do
@@ -497,6 +500,7 @@ cabalHelperCradle file = do
                    , cradleOptsProg =
                        CradleAction { actionName = Bios.Other (projectNoneType proj)
                                     , runCradle = \_ _ -> return CradleNone
+                                    , runGhcCmd = \_ -> pure CradleNone
                                     }
                    }
         Just realPackage -> do
@@ -517,6 +521,9 @@ cabalHelperCradle file = do
                                         realPackage
                                         normalisedPackageLocation
                                         fp
+                                    , runGhcCmd = \args -> do
+                                        let programs = qePrograms env
+                                        Bios.readProcessWithCwd normalisedPackageLocation (ghcProgram programs) args ""
                                     }
                    }
 
@@ -558,6 +565,7 @@ cabalHelperAction proj env package root fp = do
       Left err   -> return
         $ CradleFail
         $ CradleError
+          []
           (ExitFailure 2)
           err
 

src/Ide/Cradle.hs

@@ -7,6 +7,7 @@ packages:
 extra-deps:
 - Cabal-3.0.2.0
 # - cabal-helper-1.1.0.0
+- hie-bios-0.6.1
 - github: DanielG/cabal-helper
   commit: 79a5608778493bf32e74b54bbf1ea2729941e50f
 - cabal-plan-0.7.0.0

stack-8.10.1.yaml

@@ -30,7 +30,9 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.5.0
+- hie-bios-0.6.1
+- github: mpickering/hie-bios
+  commit: b925bbfacf4f42898733d696b62a829258cd9cf9
 - hlint-2.2.8
 - hoogle-5.0.17.11
 - hsimport-0.11.0@rev:2
@@ -49,8 +51,6 @@ extra-deps:
 - regex-tdfa-1.3.1.0
 - rope-utf16-splay-0.3.1.0
 - shake-0.19.1
-# - github: wz1000/shake
-#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - strict-list-0.1.5
 - stylish-haskell-0.11.0.0
 - syz-0.2.0.0

stack-8.6.4.yaml

@@ -24,7 +24,7 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:1
 - indexed-profunctors-0.1

stack-8.6.5.yaml

@@ -22,7 +22,7 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - hlint-2.2.8
 - hoogle-5.0.17.11
 - hsimport-0.11.0

stack-8.8.2.yaml

@@ -20,7 +20,7 @@ extra-deps:
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
 - haskell-src-exts-1.21.1
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - hlint-2.2.8
 - hoogle-5.0.17.11
 - hsimport-0.11.0

stack-8.8.3.yaml

@@ -24,7 +24,7 @@ extra-deps:
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0
 - haskell-lsp-types-0.22.0.0
-- hie-bios-0.5.0
+- hie-bios-0.6.1
 - HsYAML-0.2.1.0@rev:1
 - HsYAML-aeson-0.2.0.0@rev:1
 - indexed-profunctors-0.1
@@ -40,8 +40,6 @@ extra-deps:
 - regex-pcre-builtin-0.95.1.1.8.43
 - regex-tdfa-1.3.1.0
 - semialign-1.1
-# - github: wz1000/shake
-#   commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
 - stylish-haskell-0.11.0.0
 - tasty-rerun-1.1.17
 - temporary-1.2.1.1