```

Update cradle handling and hie-bios dependency

Refactored cradle handling to use NonEmpty lists for better type safety and consistency. Updated hie-bios dependency to a new commit to incorporate recent fixes and improvements. Adjusted related functions to align with the new data structures and improved error handling.

```

Author: soulomoon

cabal.project

@@ -6,7 +6,7 @@ packages:
          ./ghcide
          ./hls-plugin-api
          ./hls-test-utils
---         ../hie-bios
+--         ../../hie-bios
 
 
 
@@ -55,4 +55,4 @@ if impl(ghc >= 9.9)
 source-repository-package
   type: git
   location: https://github.com/soulomoon/hie-bios.git
-  tag: 4a56177ec2023bf734a59e4793c3a8e3cb6c2cd3
+  tag: 9b07c0804e1ef44e7ed64ca1ee2cf5818f8216bf

ghcide/session-loader/Development/IDE/Session.hs

@@ -119,6 +119,7 @@ import qualified System.Random                       as Random
 import           System.Random                       (RandomGen)
 import           Text.ParserCombinators.ReadP        (readP_to_S)
 
+import           Data.Tuple                          (swap)
 import           GHC.Data.Bag
 import           GHC.Driver.Env                      (hsc_all_home_unit_ids)
 import           GHC.Driver.Errors.Types
@@ -146,7 +147,7 @@ data Log
   | LogSessionLoadingResult !(Either [CradleError] (ComponentOptions, FilePath, String))
   | LogCradle !(Cradle Void)
   | LogNoneCradleFound FilePath
-  | LogNoneCradleFounds [FilePath]
+  | LogNoneCradleFounds (NE.NonEmpty FilePath)
   | LogNewComponentCache !(([FileDiagnostic], Maybe HscEnvEq), DependencyInfo)
   | LogHieBios HieBios.Log
   | LogSessionLoadingChanged
@@ -648,18 +649,18 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
 
     let
       consultCradles [] = return []
-      consultCradles hyCfpList = do
+      consultCradles hyCfpList@(h:hs) = do
             let lfpLogs = map (makeRelative rootDir . snd) hyCfpList
             logWith recorder Info $ LogCradlePaths lfpLogs
-            cradles <- mapM (\(hieYaml, _) -> loadCradle recorder hieYaml rootDir) hyCfpList
+            cradles <- mapM (\(hieYaml, _) -> do c <- loadCradle recorder hieYaml rootDir; return (c,h)) (h:|hs)
             when optTesting $ mRunLspT lspEnv $ mapM_ (\(_, cfp) -> sendNotification (SMethod_CustomMethod (Proxy @"ghcide/cradle/loaded")) (toJSON cfp)) hyCfpList
-            let progMsg = "Setting up " <> T.intercalate "," (T.pack . takeBaseName . cradleRootDir <$> cradles)
+            let progMsg = "Setting up " <> T.intercalate "," (T.pack . takeBaseName . cradleRootDir <$> NE.toList (fmap fst cradles))
                          <> " (for " <> T.intercalate "," (T.pack <$> lfpLogs) <> ")"
             eoptsList <- mRunLspTCallback lspEnv (\act -> withIndefiniteProgress progMsg Nothing NotCancellable (const act)) $
                 do old_files <- readIORef cradle_files
-                   res <- cradleToOptsAndLibDirs recorder (sessionLoading clientConfig) (zip cradles hyCfpList) old_files
+                   res <- cradleToOptsAndLibDirs recorder (sessionLoading clientConfig) cradles  old_files
                    return res
-            mapM (\(cr, hieYaml, fps, eopts) -> eoptsHscEnv (hieYaml, fps, cr, eopts))  eoptsList
+            mapM (\(cr, hieYaml, fps, eopts) -> eoptsHscEnv (hieYaml, NE.toList fps, cr, eopts)) eoptsList
 
     let
         -- | We allow users to specify a loading strategy.
@@ -711,7 +712,6 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
             let cachedMap = Map.fromList cachedResults
             return $ consultMap <> cachedMap
 
-
     let getOptionsList :: [FilePath] -> IO (Map.Map FilePath (IdeResult HscEnvEq, [FilePath]))
         getOptionsList files = do
             let ncfps = toNormalizedFilePath' <$> files
@@ -741,25 +741,20 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
 
 
 -- how we do batch loading of cradles depends on the the type of cradle we are using
-cradleToOptsAndLibDirs :: Recorder (WithPriority Log) -> SessionLoadingPreferenceConfig -> [(Cradle Void, (Maybe FilePath, FilePath))] -> [FilePath]
-                      -> IO [(Cradle Void, Maybe FilePath, [FilePath], Either [CradleError] (ComponentOptions, FilePath, String))]
-cradleToOptsAndLibDirs recorder loadConfig [] old_fps = error "cradleToOptsAndLibDirs: empty list of cradles"
-cradleToOptsAndLibDirs recorder loadConfig cradleFiles@(cr:crs) old_fps = do
-    -- let result :: [([FilePath], CradleLoadResult ComponentOptions)]
-    results <- HieBios.getCompilerOptionsInBatch (LoadWithContext old_fps) (second snd cr :| map (second snd) crs)
-    mapM (\(fps, crr) -> collectBiosResult'' recorder (getFirstCradle fps cradleFiles) fps crr) results
+cradleToOptsAndLibDirs :: Recorder (WithPriority Log) -> SessionLoadingPreferenceConfig -> NE.NonEmpty (Cradle Void, (Maybe FilePath, FilePath)) -> [FilePath]
+                      -> IO [(Cradle Void, Maybe FilePath, NE.NonEmpty FilePath, Either [CradleError] (ComponentOptions, FilePath, String))]
+cradleToOptsAndLibDirs recorder loadConfig cradleFiles old_fps = do
+    cradleRes <- HieBios.getCompilerOptionsInBatch loadStyle (second swap <$> cradleFiles)
+    mapM (\(cfps@((c,(_,h)):|_), crr) -> collectBiosResult'' recorder (c, h) (fst . snd <$> cfps) crr) cradleRes
     where
-        getFirstCradle :: [FilePath] -> [(Cradle Void, (Maybe FilePath, FilePath))] -> (Cradle Void, Maybe FilePath)
-        getFirstCradle [] _cradleFiles = error "cradleToOptsAndLibDirs: empty list of cradles"
-        getFirstCradle (f:_) cradleFiles =
-            case filter ((==f) . snd . snd) cradleFiles of
-                [] -> error "cradleToOptsAndLibDirs: file not found in cradleFiles"
-                ((cr, (my,_)):_) -> (cr, my)
+        loadStyle = case loadConfig of
+            PreferSingleComponentLoading -> LoadFile
+            PreferMultiComponentLoading  -> LoadWithContext old_fps
         collectBiosResult'' recorder (cradle, hieYaml) files cradleRes = do
-                result <- collectBiosResult' recorder (cradle, hieYaml) files cradleRes
+                result <- collectBiosResult' recorder cradle files cradleRes
                 return (cradle, hieYaml, files, result)
-        collectBiosResult' :: Recorder (WithPriority Log) -> (Cradle Void, Maybe FilePath) -> [FilePath] -> CradleLoadResult a2 -> IO (Either [CradleError] (a2, FilePath, String))
-        collectBiosResult' recorder (cradle, _) files cradleRes =
+        collectBiosResult' :: Recorder (WithPriority Log) -> Cradle Void -> NE.NonEmpty FilePath -> CradleLoadResult a2 -> IO (Either [CradleError] (a2, FilePath, String))
+        collectBiosResult' recorder cradle files cradleRes =
             case cradleRes of
                 CradleSuccess r -> do
                     -- Now get the GHC lib dir