use set for old files

haskell · Oct 27, 2024 · fe20770 · fe20770
1 parent 7d38a6d
commit fe20770
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cabal.project b/cabal.project
@@ -55,4 +55,4 @@ if impl(ghc >= 9.9)
 source-repository-package
   type: git
   location: https://github.com/soulomoon/hie-bios.git
-  tag: 9b07c0804e1ef44e7ed64ca1ee2cf5818f8216bf
+  tag: 45cfe1f4e1bac53e6d6f0cc98c3e8031d85c8e24
diff --git a/ghcide/session-loader/Development/IDE/Session.hs b/ghcide/session-loader/Development/IDE/Session.hs
@@ -436,7 +436,7 @@ getHieDbLoc dir = do
 loadSessionWithOptions :: Recorder (WithPriority Log) -> SessionLoadingOptions -> FilePath -> TQueue (IO ()) -> IO (Action IdeGhcSession)
 loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
   let toAbsolutePath = toAbsolute rootDir -- see Note [Root Directory]
-  cradle_files <- newIORef []
+  cradle_files <- newIORef $ Set.empty
   -- Mapping from hie.yaml file to HscEnv, one per hie.yaml file
   hscEnvs <- newVar Map.empty :: IO (Var HieMap)
   -- Mapping from a Filepath to HscEnv
@@ -639,7 +639,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
                  [] -> error $ "GHC version could not be parsed: " <> version
                  ((runTime, _):_)
                    | compileTime == runTime -> do
-                     atomicModifyIORef' cradle_files (\xs -> (cfps<>xs,()))
+                     atomicModifyIORef' cradle_files (\xs -> (Set.fromList cfps<>xs,()))
                      fmap (fmap Just) $ session (hieYaml, toNormalizedFilePath' <$> cfps, opts, libDir)
                    | otherwise -> return ([(toNormalizedFilePath' cfp, (([renderPackageSetupException cfp GhcVersionMismatch{..}], Nothing), [])) | cfp <- cfps], Nothing)
              -- Failure case, either a cradle error or the none cradle
@@ -658,7 +658,7 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
                          <> " (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) cradles  old_files
+                   res <- cradleToOptsAndLibDirs recorder (sessionLoading clientConfig) cradles (Set.toList old_files)
                    return res
             mapM (\(cr, hieYaml, fps, eopts) -> eoptsHscEnv (hieYaml, NE.toList fps, cr, eopts)) eoptsList