Development.IDE.Core.Compile: getDocsBatch: ([(,)]->Map)

Author: Anton-Latukha

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

@@ -965,11 +965,11 @@ getDocsBatch
   :: HscEnv
   -> Module  -- ^ a moudle where the names are in scope
   -> [Name]
-  -> IO [(Name, Either String (Maybe HsDocString, Map.Map Int HsDocString))]
+  -> IO (Map.Map 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 $ fun x
+        Just x  -> return $ Map.fromList $ fun x
         Nothing -> throwErrors errs
   where
     fun :: [(Name, Either GetDocsFailure c)] -> [(Name, Either String c)]

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

@@ -32,6 +32,7 @@ import           System.Directory
 import           System.FilePath
 
 import           Language.LSP.Types             (filePathToUri, getUri)
+import qualified Data.Map                       as Map
 
 mkDocMap
   :: HscEnv
@@ -67,7 +68,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" $ (fmap . fmap) snd $ getDocsBatch env mod names
+  res <- catchSrcErrors (hsc_dflags env) "docs" $ (fmap . fmap) snd $ fmap Map.toList $ getDocsBatch env mod names
   case res of
       Left _    -> return []
       Right res -> zipWithM unwrap res names