[haskell indexer facebookincubator#4] Refactor: pass options bundled

Author: simonmar

glean/lang/haskell/HieIndexer/Index.hs

@@ -381,17 +381,15 @@ indexTypes unit typeArr = foldM go IntMap.empty (A.assocs typeArr)
 
 indexHieFile
   :: Glean.Writer
-  -> NonEmpty Text
-  -> Maybe Text
-  -> UnitName
+  -> HieIndexerOptions
   -> FilePath
   -> HieFile
   -> IO ()
-indexHieFile writer srcPaths srcPrefix unit path hie = do
+indexHieFile writer HieIndexerOptions{..} path hie = do
   srcFile <- findSourceFile srcPaths (hie_module hie) (hie_hs_file hie)
   logInfo $ "Indexing: " <> path <> " (" <> srcFile <> ")"
   Glean.writeFacts writer $ Glean.withUnit (gleanUnit smod) $ do
-    modfact <- mkModule smod unit
+    modfact <- mkModule smod unitName
 
     let offs = getLineOffsets (hie_hs_src hie)
     let hsFileFS = GHC.mkFastString $ hie_hs_file hie
@@ -403,7 +401,7 @@ indexHieFile writer srcPaths srcPrefix unit path hie = do
     Glean.makeFact_ @Hs.ModuleSource $
       Hs.ModuleSource_key modfact filefact
 
-    typeMap <- indexTypes unit (hie_types hie)
+    typeMap <- indexTypes unitName (hie_types hie)
 
     let toByteRange = srcRangeToByteRange fileLines (hie_hs_src hie)
         toByteSpan sp
@@ -451,7 +449,7 @@ indexHieFile writer srcPaths srcPrefix unit path hie = do
               -- But it does happen, so let's not crash.
               return Nothing
             Just m -> do
-              mod <- if m == smod then return modfact else mkModule m unit
+              mod <- if m == smod then return modfact else mkModule m unitName
               Just <$> mkName name mod (Hs.NameSort_external def)
 
     sigMap <- produceDeclInfo filefact toByteSpan getName declInfo

glean/lang/haskell/HieIndexer/Main.hs

@@ -15,12 +15,10 @@ import Control.Monad.State (StateT, evalStateT, get, liftIO, put)
 import qualified Data.ByteString as BS
 import Data.Default
 import Data.IORef
-import Data.List.NonEmpty (NonEmpty)
 import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.Map as AMap
 import qualified Data.Set as Set
 import qualified Data.HashSet as HashSet
-import Data.Text (Text)
 import qualified Data.Text as Text
 import Options.Applicative
 import System.Directory
@@ -87,7 +85,7 @@ defaultMain cfg repo backend = do
 
   Glean.withSender backend repo allPredicates def $ \sender -> do
     Glean.withWriter sender def $
-      indexHieFiles paths (srcPaths cfg) (srcPrefix cfg) (unitName cfg)
+      indexHieFiles paths cfg
 
   predicates <-
     Glean.schemaInfo_predicateIds
@@ -119,22 +117,20 @@ outputMain cfg out schema_id backend = do
   paths <- getHieFilesIn (NonEmpty.toList (hiePaths cfg))
   ((), batch) <-
     Glean.withBatchWriter backend schema_id Nothing def $
-      indexHieFiles paths (srcPaths cfg) (srcPrefix cfg) (unitName cfg)
+      indexHieFiles paths cfg
   BS.writeFile out (Thrift.Protocol.Compact.serializeCompact batch)
 
 indexHieFiles
   :: HashSet.HashSet FilePath
-  -> NonEmpty Text
-  -> Maybe Text
-  -> UnitName
+  -> HieIndexerOptions
   -> Glean.Writer
   -> IO ()
-indexHieFiles paths srcs srcPrefix unitName writer =
+indexHieFiles paths opts writer =
   forM_ (HashSet.toList paths) $ \f -> do
     nc <- newIORef =<< makeNc
     runDbM nc $ do
       withHieFile f $ \h ->
-        liftIO $ indexHieFile writer srcs srcPrefix unitName f h
+        liftIO $ indexHieFile writer opts f h
 
 {- | Recursively search for @.hie@ and @.hie-boot@  files in given directory
    avoiding loops due to symlinks