Skip to content

Commit dad9fa5

Browse files
committed
Use cabal-helper cradle instead implicit one
1 parent 2a58af8 commit dad9fa5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

exe/Main.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolut
6161
import HIE.Bios.Types
6262
import HscTypes (HscEnv(..), ic_dflags)
6363
import qualified Language.Haskell.LSP.Core as LSP
64+
import Ide.Cradle
6465
import Ide.Logger
6566
import Ide.Plugin
6667
import Ide.Plugin.Config
@@ -97,6 +98,7 @@ import Ide.Plugin.Ormolu as Ormolu
9798
import Ide.Plugin.Brittany as Brittany
9899
#endif
99100
import Ide.Plugin.Pragmas as Pragmas
101+
import Data.Void (vacuous)
100102

101103

102104
-- ---------------------------------------------------------------------
@@ -439,7 +441,7 @@ loadSession dir = liftIO $ do
439441
-- throwing an async exception
440442
void $ forkIO $ do
441443
putStrLn $ "Consulting the cradle for " <> show file
442-
cradle <- maybe (loadImplicitCradle $ addTrailingPathSeparator dir) loadCradle hieYaml
444+
cradle <- maybe (cabalHelperCradle cfp) (fmap vacuous . loadCradle) hieYaml
443445
opts <- cradleToSessionOpts cradle cfp
444446
print opts
445447
res <- fst <$> session (hieYaml, toNormalizedFilePath' cfp, opts)

0 commit comments

Comments
 (0)