Record dependencies between boot files and non-boot files

Author: wz1000

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

@@ -407,7 +407,7 @@ type RawDepM a = StateT (RawDependencyInformation, IntMap ArtifactsLocation) Act
 execRawDepM :: Monad m => StateT (RawDependencyInformation, IntMap a1) m a2 -> m (RawDependencyInformation, IntMap a1)
 execRawDepM act =
     execStateT act
-        ( RawDependencyInformation IntMap.empty emptyPathIdMap IntMap.empty
+        ( RawDependencyInformation IntMap.empty emptyPathIdMap IntMap.empty IntMap.empty
         , IntMap.empty
         )
 
@@ -434,6 +434,11 @@ rawDependencyInformation fs = do
           let al = modSummaryToArtifactsLocation f msum
           -- Get a fresh FilePathId for the new file
           fId <- getFreshFid al
+          -- Record this module and its location
+          whenJust msum $ \ms ->
+            modifyRawDepInfo (\rd -> rd { rawModuleNameMap = IntMap.insert (coerce fId)
+                                                                           (coerce (moduleName $ ms_mod ms))
+                                                                           (rawModuleNameMap rd)})
           -- Adding an edge to the bootmap so we can make sure to
           -- insert boot nodes before the real files.
           addBootMap al fId

ghcide/src/Development/IDE/Import/DependencyInformation.hs

@@ -129,6 +129,7 @@ data RawDependencyInformation = RawDependencyInformation
     -- need to add edges between .hs-boot and .hs so that the .hs files
     -- appear later in the sort.
     , rawBootMap   :: !BootIdMap
+    , rawModuleNameMap :: (FilePathIdMap ShowableModuleName)
     } deriving Show
 
 data DependencyInformation =
@@ -220,15 +221,12 @@ processDependencyInformation RawDependencyInformation{..} =
     { depErrorNodes = IntMap.fromList errorNodes
     , depModuleDeps = moduleDeps
     , depReverseModuleDeps = reverseModuleDeps
-    , depModuleNames = IntMap.fromList $ coerce moduleNames
+    , depModuleNames = rawModuleNameMap
     , depPathIdMap = rawPathIdMap
     , depBootMap = rawBootMap
     }
   where resultGraph = buildResultGraph rawImports
         (errorNodes, successNodes) = partitionNodeResults $ IntMap.toList resultGraph
-        moduleNames :: [(FilePathId, ModuleName)]
-        moduleNames =
-          [ (fId, modName) | (_, imports) <- successNodes, (L _ modName, fId) <- imports]
         successEdges :: [(FilePathId, [FilePathId])]
         successEdges =
             map