Explicitly model more dependencies on cradle startup

src/HIE/Bios/Cradle.hs

@@ -57,7 +57,8 @@
 import qualified Data.Conduit as C
 import qualified Data.Conduit.Text as C
 import qualified Data.HashMap.Strict as Map
-import Data.Maybe (fromMaybe)
+import Data.Foldable (for_)
+import Data.Maybe (fromMaybe, isJust, maybe)
 import Data.List
 import Data.List.Extra (trimEnd, nubOrd)
 import Data.Ord (Down(..))
@@ -155,15 +156,15 @@
 -- each prefix we know how to handle
 data ResolvedCradles a
  = ResolvedCradles
  { cradleRoot :: FilePath
  , resolvedCradles :: [ResolvedCradle a] -- ^ In order of decreasing specificity
  , cradleBuildToolVersions :: BuildToolVersions
  }
 
 type BuildToolVersions = BuildToolVersions' (Maybe Version)
 data BuildToolVersions' v =
   BuildToolVersions { cabalVersion  :: v
                     , stackVersion  :: v
                     }
   deriving (Functor, Foldable, Traversable)
 
@@ -280,7 +281,7 @@
 
 
 resolveCradleAction :: Show a => LogAction IO (WithSeverity Log) -> (b -> CradleAction a) -> ResolvedCradles b -> FilePath -> ResolvedCradle b -> IO (CradleAction a)
 resolveCradleAction l buildCustomCradle cs root cradle = fmap addLoadStyleLogToCradleAction $
   case concreteCradle cradle of
     ConcreteCabal t -> cabalCradle l cs root (cabalComponent t) (projectConfigFromMaybe root (cabalProjectFile t))
     ConcreteStack t -> pure $ stackCradle l root (stackComponent t) (projectConfigFromMaybe root (stackYaml t))
@@ -479,7 +480,7 @@
       , runCradle = biosAction runGhcCmd wdir biosCall biosDepsCall l
       , runGhcCmd = runGhcCmd
       }
       where runGhcCmd = \args -> readProcessWithCwd l wdir (fromMaybe "ghc" mbGhc) args ""
 
 biosWorkDir :: FilePath -> MaybeT IO FilePath
 biosWorkDir = findFileUpwards ".hie-bios"
@@ -506,15 +507,14 @@
   -> FilePath
   -> LoadStyle
   -> IO (CradleLoadResult ComponentOptions)
 biosAction runGhcCmd wdir bios bios_deps l fp loadStyle = do
   ghc_version <- getGhcVersion runGhcCmd
   determinedLoadStyle <- case ghc_version of
     Just ghc
-      -- Multi-component supported from ghc 9.4
       -- We trust the assertion for a bios program, as we have no way of
       -- checking its version
       | LoadWithContext _ <- loadStyle ->
-          if ghc >= makeVersion [9,4]
+          if isCabalMultipleCompSupported Nothing (Just ghc)
             then pure loadStyle
             else do
               liftIO $ l <& WithSeverity
@@ -596,10 +596,10 @@
       CradleSuccess out -> out
       _ -> Nothing
 
     ghcPath = fst <$> cabalPathOutput
     ghcVersion = snd =<< cabalPathOutput
 
     runGhcCmd args = runCradleResultT $ do
         case ghcPath of
           Just p -> readProcessWithCwd_ l wdir p args ""
           Nothing -> do
@@ -630,7 +630,7 @@
 -- the custom ghc wrapper may use as a fallback if it can not respond to certain
 -- queries, such as ghc version or location of the libdir.
 cabalProcess :: LogAction IO (WithSeverity Log) -> CradleProjectConfig -> FilePath -> Maybe FilePath -> String -> [String] -> CradleLoadResultT IO CreateProcess
 cabalProcess l cabalProject workDir ghcPath command args = do
   ghcDirs@(ghcBin, libdir) <- case ghcPath of
     Just p -> do
       libdir <- readProcessWithCwd_ l workDir p ["--print-libdir"] ""
@@ -885,12 +885,11 @@
 isCabalPathSupported :: BuildToolVersions -> Bool
 isCabalPathSupported = maybe False (>= makeVersion [3,14]) . cabalVersion
 
-isCabalMultipleCompSupported :: BuildToolVersions -> Maybe Version -> Bool
-isCabalMultipleCompSupported vs ghcVersion = do
-  -- determine which load style is supported by this cabal cradle.
-  case (cabalVersion vs, ghcVersion) of
-    (Just cabal, Just ghc) -> ghc >= makeVersion [9, 4] && cabal >= makeVersion [3, 11]
-    _ -> False
+isCabalMultipleCompSupported :: Maybe BuildToolVersions -> Maybe Version -> Bool
+isCabalMultipleCompSupported mvs ghcVersion = isJust $ do
+  let atLeast v = guard . maybe False (makeVersion v <=)
+  atLeast [9,4] ghcVersion
+  for_ mvs $ \vs -> atLeast [3,11] $ cabalVersion vs -- Only gate on cabal version if known
 
 cabalAction
   :: ResolvedCradles a
@@ -904,7 +903,7 @@
   -> LoadStyle
   -> CradleLoadResultT IO ComponentOptions
 cabalAction (ResolvedCradles root cs vs) workDir ghcPath ghcVersion mc l projectFile fp loadStyle = do
-  let multiCompSupport = isCabalMultipleCompSupported vs ghcVersion
+  let multiCompSupport = isCabalMultipleCompSupported (Just vs) ghcVersion
   -- determine which load style is supported by this cabal cradle.
   determinedLoadStyle <- case loadStyle of
     LoadWithContext _ | not multiCompSupport -> do

tests/Utils.hs

@@ -321,7 +321,7 @@ isCabalMultipleCompSupported' = do
   root <- askRoot
   versions <- liftIO $ makeVersions (cradleLogger cr) root
   v <- liftIO $ getGhcVersion ((runGhcCmd . cradleOptsProg) cr)
-  pure $ isCabalMultipleCompSupported versions v
+  pure $ isCabalMultipleCompSupported (Just versions) v
 
 inCradleRootDir :: TestM a -> TestM a
 inCradleRootDir act = do