ghcide: Core.Compile: getDocsBatch: instead of IO throw use Either

Throw was vacuous - it was thrown & catched & ignored.

At least it shows explicit type to process further.

Author: Anton-Latukha

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

@@ -965,12 +965,12 @@ getDocsBatch
   :: HscEnv
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
-  -> IO (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString)))
+  -> IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString))))
 getDocsBatch hsc_env _mod _names = do
     ((_warns,errs), res) <- initTc hsc_env HsSrcFile False _mod fakeSpan $ Map.fromList <$> traverse findNameInfo _names
     case res of
-        Just x  -> return $ fun x
-        Nothing -> throwErrors errs
+        Just x  -> pure $ pure $ fun x
+        Nothing -> pure $ Left errs
   where
     fun :: Map.Map Name (Either GetDocsFailure c) -> Map.Map Name (Either T.Text c)
     fun =
@@ -979,8 +979,6 @@ getDocsBatch hsc_env _mod _names = do
       fun1 :: Either GetDocsFailure c -> Either T.Text c
       fun1 = first showGhc
 
-    throwErrors = liftIO . throwIO . mkSrcErr
-
     findNameInfo :: Name -> IOEnv (Env TcGblEnv TcLclEnv) (Name, Either GetDocsFailure (Maybe HsDocString, Map.Map Int HsDocString))
     findNameInfo name =
         case nameModule_maybe name of

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

@@ -33,7 +33,6 @@ import           System.FilePath
 
 import           Language.LSP.Types             (filePathToUri, getUri)
 import qualified Data.Map                       as Map
-import           Development.IDE.Types.Diagnostics (FileDiagnostic)
 
 mkDocMap
   :: HscEnv
@@ -72,11 +71,11 @@ getDocumentationsTryGhc :: HscEnv -> Module -> [Name] -> IO (Map.Map Name SpanDo
 getDocumentationsTryGhc env mod names = do
   res <- fun
   case res of
-      Left _    -> return mempty
-      Right res -> fmap Map.fromList $ sequenceA $ uncurry unwrap <$> Map.toList res
+    Left _    -> return mempty -- catchSrcErrors (hsc_dflags env) "docs"
+    Right res -> fmap Map.fromList $ sequenceA $ uncurry unwrap <$> Map.toList res
   where
-    fun :: IO (Either [FileDiagnostic] (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString))))
-    fun = catchSrcErrors (hsc_dflags env) "docs" $ getDocsBatch env mod names
+    fun :: IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString))))
+    fun = getDocsBatch env mod names
 
     unwrap :: Name -> Either a (Maybe HsDocString, b) -> IO (Name, SpanDoc)
     unwrap name a = (name,) . extractDocString a <$> getSpanDocUris name