File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -61,6 +61,7 @@ import HIE.Bios.Environment (addCmdOpts, makeDynFlagsAbsolut
6161import HIE.Bios.Types
6262import HscTypes (HscEnv (.. ), ic_dflags )
6363import qualified Language.Haskell.LSP.Core as LSP
64+ import Ide.Cradle
6465import Ide.Logger
6566import Ide.Plugin
6667import Ide.Plugin.Config
@@ -97,6 +98,7 @@ import Ide.Plugin.Ormolu as Ormolu
9798import Ide.Plugin.Brittany as Brittany
9899#endif
99100import Ide.Plugin.Pragmas as Pragmas
101+ import Data.Void (vacuous )
100102
101103
102104-- ---------------------------------------------------------------------
@@ -439,8 +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
443- opts <- cradleToSessionOpts cradle cfp
444+ cradle <- maybe (cabalHelperCradle cfp) (fmap vacuous . loadCradle) hieYaml
444445 print opts
445446 res <- fst <$> session (hieYaml, toNormalizedFilePath' cfp, opts)
446447 signalBarrier finished_barrier res
You can’t perform that action at this time.
0 commit comments