Development.IDE.Core.Compile: getDocsBatch: return (Name,)

The types show it needs be such.

The semantics of code in funciton show it needs be such.

The use of the function shows it needs to be such.

`zipWithM .. names` would not be needed.

Author: Anton-Latukha

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

@@ -965,27 +965,37 @@ getDocsBatch
   :: HscEnv
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
-  -> IO [Either String (Maybe HsDocString, Map.Map Int HsDocString)]
+  -> IO [(Name, Either String (Maybe HsDocString, Map.Map Int HsDocString))]
 getDocsBatch hsc_env _mod _names = do
     ((_warns,errs), res) <- initTc hsc_env HsSrcFile False _mod fakeSpan $ traverse findNameInfo _names
     case res of
-        Just x  -> return $ map (first $ T.unpack . showGhc) x
+        Just x  -> return $ fun x
         Nothing -> throwErrors errs
   where
+    fun :: [(Name, Either GetDocsFailure c)] -> [(Name, Either String c)]
+    fun =
+      map fun1
+     where
+      fun1 :: ((Name, Either GetDocsFailure c) -> (Name, Either String c))
+      fun1 = fmap (first $ T.unpack . showGhc)
+
     throwErrors = liftIO . throwIO . mkSrcErr
 
-    findNameInfo :: Name -> IOEnv (Env TcGblEnv TcLclEnv) (Either GetDocsFailure (Maybe HsDocString, Map.Map Int HsDocString))
+    findNameInfo :: Name -> IOEnv (Env TcGblEnv TcLclEnv) (Name, Either GetDocsFailure (Maybe HsDocString, Map.Map Int HsDocString))
     findNameInfo name =
         case nameModule_maybe name of
-            Nothing -> return (Left $ NameHasNoModule name)
+            Nothing -> return (name, Left $ NameHasNoModule name)
             Just mod -> do
-             ModIface { mi_doc_hdr = mb_doc_hdr
-                      , mi_decl_docs = DeclDocMap dmap
-                      , mi_arg_docs = ArgDocMap amap
-                      } <- loadModuleInterface "getModuleInterface" mod
-             pure $ if isNothing mb_doc_hdr && Map.null dmap && Map.null amap
-               then Left (NoDocsInIface mod $ compiled name)
-               else Right (Map.lookup name dmap, Map.findWithDefault mempty name amap)
+              ModIface
+                { mi_doc_hdr = mb_doc_hdr
+                , mi_decl_docs = DeclDocMap dmap
+                , mi_arg_docs = ArgDocMap amap
+                }
+                <- loadModuleInterface "getModuleInterface" mod
+              pure . (name,) $
+                if isNothing mb_doc_hdr && Map.null dmap && Map.null amap
+                then Left $ NoDocsInIface mod $ compiled name
+                else Right (Map.lookup name dmap, Map.findWithDefault mempty name amap)
     compiled n =
       -- TODO: Find a more direct indicator.
       case nameSrcLoc n of

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

@@ -67,7 +67,7 @@ getDocumentationTryGhc env mod n = head <$> getDocumentationsTryGhc env mod [n]
 
 getDocumentationsTryGhc :: HscEnv -> Module -> [Name] -> IO [SpanDoc]
 getDocumentationsTryGhc env mod names = do
-  res <- catchSrcErrors (hsc_dflags env) "docs" $ getDocsBatch env mod names
+  res <- catchSrcErrors (hsc_dflags env) "docs" $ (fmap . fmap) snd $ getDocsBatch env mod names
   case res of
       Left _    -> return []
       Right res -> zipWithM unwrap res names