ghcide: Core.Compile: getDocsBatch: no faking ArgMap, say Maybe

We can not process/reason on the ArgDoc logic - if we pretend no docs are docs.

It is also aligns with main doc blocks processing.

Author: Anton-Latukha

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

@@ -994,12 +994,12 @@ getDocsBatch
   :: HscEnv
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
-  -> IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString))))
+  -> IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Maybe (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  -> pure $ pure $ fun x
-        Nothing -> pure $ Left errs
+    pure $ case res of
+        Just x  -> pure $ fun x
+        Nothing -> Left errs
   where
     fun :: Map.Map Name (Either GetDocsFailure c) -> Map.Map Name (Either T.Text c)
     fun =
@@ -1008,7 +1008,7 @@ getDocsBatch hsc_env _mod _names = do
       fun1 :: Either GetDocsFailure c -> Either T.Text c
       fun1 = first showGhc
 
-    findNameInfo :: Name -> IOEnv (Env TcGblEnv TcLclEnv) (Name, Either GetDocsFailure (Maybe HsDocString, Map.Map Int HsDocString))
+    findNameInfo :: Name -> IOEnv (Env TcGblEnv TcLclEnv) (Name, Either GetDocsFailure (Maybe HsDocString, Maybe (Map.Map Int HsDocString)))
     findNameInfo name =
         case nameModule_maybe name of
             Nothing -> return (name, Left $ NameHasNoModule name)
@@ -1022,7 +1022,7 @@ getDocsBatch hsc_env _mod _names = do
               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)
+                else Right (Map.lookup name dmap, Map.lookup name amap)
     compiled n =
       -- TODO: Find a more direct indicator.
       case nameSrcLoc n of

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

@@ -74,7 +74,7 @@ getDocumentationsTryGhc env mod names = do
     Left _    -> return mempty -- catchSrcErrors (hsc_dflags env) "docs"
     Right res -> fmap Map.fromList $ sequenceA $ uncurry unwrap <$> Map.toList res
   where
-    fun :: IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Map.Map Int HsDocString))))
+    fun :: IO (Either ErrorMessages (Map.Map Name (Either T.Text (Maybe HsDocString, Maybe (Map.Map Int HsDocString)))))
     fun = getDocsBatch env mod names
 
     unwrap :: Name -> Either a (Maybe HsDocString, b) -> IO (Name, SpanDoc)