remove fromJust

Author: wz1000

ghcide/exe/Main.hs

@@ -58,7 +58,6 @@ import Development.IDE.Plugin.HLS.GhcIde as GhcIde
 import Ide.Plugin.Config
 import Ide.PluginUtils (allLspCmdIds', getProcessID, pluginDescToIdePlugins)
 
-import HieDb.Types (LibDir(..))
 import HieDb.Run (Options(..), runCommand)
 
 ghcideVersion :: IO String
@@ -99,7 +98,7 @@ main = do
               , quiet = False
               , virtualFile = False
               }
-        runCommand (LibDir $ fromJust libdir) opts cmd
+        runCommand libdir opts cmd
       Typecheck (Just -> argFilesOrCmd) | not argLSP -> runWithDb dbLoc $ runIde Arguments{..}
       _ -> let argFilesOrCmd = Nothing in runWithDb dbLoc $ runIde Arguments{..}
 

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

@@ -66,6 +66,7 @@ import qualified System.Directory.Extra as IO
 import System.FilePath
 import System.Info
 import System.IO
+import System.Exit
 
 import GHCi
 import HscTypes (ic_dflags, hsc_IC, hsc_dflags, hsc_NC)
@@ -106,20 +107,22 @@ defaultLoadingOptions = SessionLoadingOptions
     }
 
 -- | Sets `unsafeGlobalDynFlags` on using the hie-bios cradle and returns the GHC libdir
-setInitialDynFlags :: IO (Maybe FilePath)
+setInitialDynFlags :: IO LibDir
 setInitialDynFlags = do
   dir <- IO.getCurrentDirectory
   hieYaml <- runMaybeT $ yamlConfig dir
   cradle <- maybe (HieBios.loadImplicitCradle $ addTrailingPathSeparator dir) HieBios.loadCradle hieYaml
   libDirRes <- getRuntimeGhcLibDir cradle
   libdir <- case libDirRes of
-      CradleSuccess libdir -> pure $ Just libdir
+      CradleSuccess libdir -> pure $ LibDir libdir
       CradleFail err -> do
         hPutStrLn stderr $ "Couldn't load cradle for libdir: " ++ show err
-        return Nothing
-      CradleNone -> return Nothing
-  dynFlags <- mapM (dynFlagsForPrinting . LibDir) libdir
-  mapM_ setUnsafeGlobalDynFlags dynFlags
+        exitWith $ ExitFailure 1
+      CradleNone -> do
+        hPutStrLn stderr $ "Couldn't load cradle (CradleNone)"
+        exitWith $ ExitFailure 1
+  dynFlags <- dynFlagsForPrinting libdir
+  setUnsafeGlobalDynFlags dynFlags
   pure libdir
 
 -- | Wraps `withHieDb` to provide a database connection for reading, and a `HieWriterChan` for