ghcide: Core.Compile: use previous IO throw

This allows without dependency import husle to support both 8.10 & 9.0.

Author: Anton-Latukha

ghcide/src/Development/IDE/Core/Compile.hs

@@ -1029,10 +1029,10 @@ getDocsNonInteractive' name =
 -- | Non-interactive modification of 'GHC.Runtime.Eval.getDocs'.
 --   The interactive paths create problems in ghc-lib builds
 ---  and lead to fun errors like "Cannot continue after interface file error".
-getDocsNonInteractive :: HscEnv -> Module -> Name -> IO (Either ErrorMessages (Name, Either GetDocsFailure (Maybe HsDocString, Maybe (Map.Map Int HsDocString))))
+getDocsNonInteractive :: HscEnv -> Module -> Name -> IO (Name, Either GetDocsFailure (Maybe HsDocString, Maybe (Map.Map Int HsDocString)))
 getDocsNonInteractive hsc_env mod name = do
     ((_warns,errs), res) <- initTypecheckEnv hsc_env mod $ getDocsNonInteractive' name
-    pure $ maybeToEither errs res
+    maybe (liftIO . throwIO . mkSrcErr $ errs) pure res
 
 
 -- | Non-interactive, batch version of 'GHC.Runtime.Eval.getDocs'.
@@ -1041,11 +1041,11 @@ getDocsBatch
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
   --  2021-11-18: NOTE: Map Int would become IntMap if next GHCs.
-  -> IO (Either ErrorMessages (Map.Map Name (Either GetDocsFailure (Maybe HsDocString, Maybe (Map.Map Int HsDocString)))))
+  -> IO (Map.Map Name (Either GetDocsFailure (Maybe HsDocString, Maybe (Map.Map Int HsDocString))))
   -- ^ Return a 'Map' of 'Name's to 'Either' (no docs messages) (general doc body & arg docs)
 getDocsBatch hsc_env mod names = do
     ((_warns,errs), res) <- initTypecheckEnv hsc_env mod $ Map.fromList <$> traverse getDocsNonInteractive' names
-    pure $ maybeToEither errs res
+    maybe (liftIO . throwIO . mkSrcErr $ errs) pure res
 
 -- | Non-interactive, batch version of 'InteractiveEval.lookupNames'.
 --   The interactive paths create problems in ghc-lib builds

ghcide/src/Development/IDE/Spans/Documentation.hs

@@ -94,14 +94,14 @@ intoSpanDoc env name a = extractDocString a <$> getSpanDocUris name
 
 getDocumentationTryGhc :: HscEnv -> Module -> Name -> IO SpanDoc
 getDocumentationTryGhc env mod name = do
-  res <- getDocsNonInteractive env mod name
+  res <- catchSrcErrors (hsc_dflags env) "docs" $ getDocsNonInteractive env mod name
   case res of
       Left _    -> pure emptySpanDoc
       Right res -> uncurry (intoSpanDoc env) res
 
 getDocumentationsTryGhc :: HscEnv -> Module -> [Name] -> IO (M.Map Name SpanDoc)
 getDocumentationsTryGhc env mod names = do
-  res <- getDocsBatch env mod names
+  res <- catchSrcErrors (hsc_dflags env) "docs" $ getDocsBatch env mod names
   case res of
     Left _    -> return mempty
     Right res -> sequenceA $ M.mapWithKey (intoSpanDoc env) res