Skip to content

Use patched version of hie-bios to load ghcide modules #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Use patched version of hie-bios to load ghcide modules #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ source-repository-package
location: https://github.com/DanielG/cabal-helper.git
tag: a18bbb2af92e9b4337e7f930cb80754f2408bcfd

source-repository-package
type: git
location: https://github.com/fendor/hie-bios.git
tag: d5b7fc9bb3025b1d4d2ac9c48b588faf18dfce99


tests: true
documentation: false
-- documentation: true
Expand Down
10 changes: 5 additions & 5 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ import DynFlags (gopt_set, gopt_unset,
updOptLevel)
import DynFlags (PackageFlag(..), PackageArg(..))
import GHC hiding (def)
import GHC.Check (runTimeVersion, compileTimeVersionFromLibdir)
import GHC.Check (runTimeVersion, compileTimeVersionFromLibdir)
-- import GhcMonad
import HIE.Bios.Cradle
import HIE.Bios.Cradle
import HIE.Bios.Environment (addCmdOpts)
import HIE.Bios.Types
import HIE.Bios.Types
import HscTypes (HscEnv(..), ic_dflags)
import qualified Language.Haskell.LSP.Core as LSP
import Ide.Logger
Expand Down Expand Up @@ -497,9 +497,9 @@ 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 compRoot theOpts dflags
let dflags'' =
-- disabled, generated directly by ghcide instead
flip gopt_unset Opt_WriteInterface $
Expand Down