update hiebois

Author: soulomoon

cabal.project

@@ -8,7 +8,7 @@ packages:
          ./hls-test-utils
 
 
-index-state: 2025-04-19T07:34:07Z
+index-state: 2025-04-26T07:34:07Z
 
 tests: True
 test-show-details: direct
@@ -53,13 +53,6 @@ allow-newer:
   cabal-install-parsers:Cabal-syntax,
 
 
-source-repository-package
-  type: git
-  location: https://github.com/haskell/hie-bios
-  tag: e372a62b780b1314a35238a698a9e3813096b122
--- see https://github.com/haskell/haskell-language-server/pull/4445#issuecomment-2705787655
-allow-older: hie-bios:optparse-applicative
-
 if impl(ghc >= 9.11)
   benchmarks: False
   allow-newer:

ghcide/ghcide.cabal

@@ -73,7 +73,7 @@ library
     , Glob
     , haddock-library              >=1.8      && <1.12
     , hashable
-    , hie-bios                     ^>=0.14.0
+    , hie-bios                     ^>=0.15.0
     , hie-compat                   ^>=0.3.0.0
     , hiedb                        ^>= 0.6.0.2
     , hls-graph                    == 2.10.0.0

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

@@ -500,6 +500,23 @@ completeFileProcessing state hieYaml ncfp file flags = do
     insertFileMapping state hieYaml ncfp
     removeFromPending state file
 
+-- | Handle successful loading by updating session state with the new file maps
+updateSessionOnSuccess :: Recorder (WithPriority Log) -> SessionState -> Maybe FilePath -> HashMap NormalizedFilePath (IdeResult HscEnvEq, DependencyInfo) -> [TargetDetails] -> IO ()
+updateSessionOnSuccess recorder state hieYaml this_flags_map all_targets = do
+  let newLoaded = Set.fromList $ fromNormalizedFilePath <$> HM.keys this_flags_map
+  atomically $ do
+    STM.insert this_flags_map hieYaml (fileToFlags state)
+    insertAllFileMappings state $ map ((hieYaml,) . fst) $ concatMap toFlagsMap all_targets
+    forM_ newLoaded $ flip S.delete (pendingFileSet state)
+  pendingFiles <- getPendingFiles state
+  let newLoaded = pendingFiles `Set.intersection` newLoaded
+  -- log new loaded files
+  logWith recorder Info $ LogSessionNewLoadedFiles $ Set.toList newLoaded
+  -- remove all new loaded file from error loading files
+  mapM_ (removeErrorLoadingFile state) (Set.toList newLoaded)
+  addCradleFiles state newLoaded
+  return ()
+
 -- | Insert multiple file mappings at once
 insertAllFileMappings :: SessionState -> [(Maybe FilePath, NormalizedFilePath)] -> STM ()
 insertAllFileMappings state mappings =
@@ -711,11 +728,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
                                        Nothing
 
           let newLoaded = Set.fromList $ fromNormalizedFilePath <$> HM.keys this_flags_map
-          atomically $ do
-            STM.insert this_flags_map hieYaml (fileToFlags sessionState)
-            insertAllFileMappings sessionState $ map ((hieYaml,) . fst) $ concatMap toFlagsMap all_targets
-            forM_ newLoaded $ flip S.delete (pendingFileSet sessionState)
-
+          updateSessionOnSuccess recorder sessionState hieYaml this_flags_map all_targets
           -- Typecheck all files in the project on startup
           checkProject <- getCheckProject
           -- The VFS doesn't change on cradle edits, re-use the old one.
@@ -769,14 +782,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
                  [] -> error $ "GHC version could not be parsed: " <> version
                  ((runTime, _):_)
                    | compileTime == runTime -> do
-                     (_results, allNewLoaded, restart) <- session (hieYaml, ncfp, opts, libDir)
-                     pendingFiles <- getPendingFiles sessionState
-                     let newLoaded = pendingFiles `Set.intersection` allNewLoaded
-                     -- log new loaded files
-                     logWith recorder Info $ LogSessionNewLoadedFiles $ Set.toList newLoaded
-                     -- remove all new loaded file from error loading files
-                     mapM_ (removeErrorLoadingFile sessionState) (Set.toList allNewLoaded)
-                     addCradleFiles sessionState newLoaded
+                     (_results, _allNewLoaded, restart) <- session (hieYaml, ncfp, opts, libDir)
                      restart
                    | otherwise -> do
                     -- Use the common pattern here: updateFileState