Skip to content
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.

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

Use cabal-helper cradle instead hie-bios implicit one #68

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolut
import HIE.Bios.Types
import HscTypes (HscEnv(..), ic_dflags)
import qualified Language.Haskell.LSP.Core as LSP
import Ide.Cradle
import Ide.Logger
import Ide.Plugin
import Ide.Plugin.Config
Expand Down Expand Up @@ -98,6 +99,7 @@ import Ide.Plugin.Ormolu as Ormolu
import Ide.Plugin.Brittany as Brittany
#endif
import Ide.Plugin.Pragmas as Pragmas
import Data.Void (vacuous)


-- ---------------------------------------------------------------------
Expand Down Expand Up @@ -443,7 +445,7 @@ loadSession dir = do
-- throwing an async exception
void $ forkIO $ do
putStrLn $ "Consulting the cradle for " <> show file
cradle <- maybe (loadImplicitCradle $ addTrailingPathSeparator dir) loadCradle hieYaml
cradle <- maybe (cabalHelperCradle cfp) (fmap vacuous . loadCradle) hieYaml
eopts <- cradleToSessionOpts cradle cfp
print eopts
case eopts of
Expand Down