Account for boot files in processDependencyInformation

Author: martijnbastiaan

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

@@ -53,7 +53,8 @@ import           Development.IDE.GHC.Compat
 import           Development.IDE.GHC.Compat.Util    (Fingerprint)
 import qualified Development.IDE.GHC.Compat.Util    as Util
 import           Development.IDE.GHC.Orphans        ()
-import           Development.IDE.Import.FindImports (ArtifactsLocation (..))
+import           Development.IDE.Import.FindImports (ArtifactsLocation (..),
+                                                     isBootLocation)
 import           Development.IDE.Types.Diagnostics
 import           Development.IDE.Types.Location
 import           GHC.Generics                       (Generic)
@@ -273,7 +274,17 @@ processDependencyInformation RawDependencyInformation{..} rawBootMap mg shallowF
           foldr (\(p, cs) res ->
             let new = IntMap.fromList (map (, IntSet.singleton (coerce p)) (coerce cs))
             in IntMap.unionWith IntSet.union new res ) IntMap.empty successEdges
-        reverseModuleMap = mkModuleEnv $ map (\(i,sm) -> (showableModule sm, FilePathId i)) $ IntMap.toList rawModuleMap
+        -- Map 'Module' to 'FilePathId', but skip hs-boot files: 'Module'
+        -- does not distinguish boot from non-boot, so the real source file
+        -- and its hs-boot share the same key. Callers (notably the
+        -- 'GetLinkable' rule via 'lookupModuleFile') need the non-boot
+        -- file because hs-boot files don't have linkables.
+        reverseModuleMap = mkModuleEnv
+          [ (showableModule sm, FilePathId i)
+          | (i, sm) <- IntMap.toList rawModuleMap
+          , Just al <- [IntMap.lookup i (idToPathMap rawPathIdMap)]
+          , not (isBootLocation al)
+          ]
 
 
 -- | Given a dependency graph, buildResultGraph detects and propagates errors in that graph as follows:

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

@@ -41,7 +41,8 @@ data Import
 data ArtifactsLocation = ArtifactsLocation
   { artifactFilePath    :: !NormalizedFilePath
   , artifactModLocation :: !(Maybe ModLocation)
-  , artifactIsSource    :: !Bool          -- ^ True if a module is a source input
+  , artifactIsSource    :: !Bool          -- ^ 'True' for a real Haskell source file ('HsSrcFile');
+                                          -- 'False' for a boot ('HsBootFile') or signature ('HsigFile') file.
   , artifactModule      :: !(Maybe Module)
   } deriving Show