multiples robustness cleanup when there are multiples target for one

module
8 failures

Author: guibou

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

@@ -331,9 +331,7 @@ getLocatedImportsRule recorder =
         let dflags = hsc_dflags env
         opt <- getIdeOptions
 
-        moduleMaps' <- use_ GetModulesPaths file
-
-        moduleMaps <- extendModuleMapWithKnownTargets file moduleMaps'
+        moduleMaps <- extendModuleMapWithKnownTargets file
 
         (diags, imports') <- fmap unzip $ forM imports $ \(isSource, (mbPkgName, modName)) -> do
 
@@ -677,10 +675,12 @@ getModulesPathsRule recorder = defineEarlyCutoff (cmapWithPrio LogShake recorder
 -- TODO: for now the implementation is O(number_of_known_files *
 -- number_of_include_path) which is inacceptable and should be addressed.
 extendModuleMapWithKnownTargets
-    :: NormalizedFilePath -> (Map.Map ModuleName (UnitId, NormalizedFilePath), Map.Map ModuleName (UnitId, NormalizedFilePath))
+    :: NormalizedFilePath
        -> Action (Map.Map ModuleName (UnitId, NormalizedFilePath), Map.Map ModuleName (UnitId, NormalizedFilePath))
-extendModuleMapWithKnownTargets file (notSourceModules, sourceModules) = do
+extendModuleMapWithKnownTargets file = do
+  (notSourceModules, sourceModules) <- use_ GetModulesPaths file
   KnownTargets targetsMap <- useNoFile_ GetKnownTargets
+
   env_eq <- use_ GhcSession file
   let env = hscEnv env_eq
   let import_dirs = map (second homeUnitEnv_dflags) $ hugElts $ hsc_HUG env
@@ -701,30 +701,25 @@ extendModuleMapWithKnownTargets file (notSourceModules, sourceModules) = do
         -- TODO: the _target may represents something different than the path
         -- stored in paths. This need to be investigated.
         (_target, paths) <- HM.toList targetsMap
-        -- TODO: I have no idea why there is multiple path here
-        if length paths > 1
-        then error "the pathlength is incorrect"
-        else do
-          guard $ length paths > 0
-          let path = head $ toList paths
-          let pathString = fromNormalizedFilePath path
-          let pathComponents = splitDirectories pathString
-
-          -- Ensure this file is in the directory
-          guard $ dirComponents `isPrefixOf` pathComponents
-
-          -- Ensure that this extension is accepted
-          guard $ takeExtension pathString `elem` acceptedExtensions
-          let modName = mkModuleName (intercalate "." $ drop dir_number_directories (splitDirectories (dropExtension pathString)))
-          let isSourceModule = "-boot" `isSuffixOf` pathString
-          if isSourceModule
-          then
-             pure (Nothing, Just (modName, (u, path)))
-          else
-             pure (Just (modName, (u, path)), Nothing)
-
-
-  pure (Map.fromList a <> notSourceModules, Map.fromList b <> sourceModules)
+        path <- HashSet.toList paths
+        let pathString = fromNormalizedFilePath path
+        let pathComponents = splitDirectories pathString
+
+        -- Ensure this file is in the directory
+        guard $ dirComponents `isPrefixOf` pathComponents
+
+        -- Ensure that this extension is accepted
+        guard $ takeExtension pathString `elem` acceptedExtensions
+        let modName = mkModuleName (intercalate "." $ drop dir_number_directories (splitDirectories (dropExtension pathString)))
+        let isSourceModule = "-boot" `isSuffixOf` pathString
+        if isSourceModule
+        then
+           pure (Nothing, Just (modName, (u, path)))
+        else
+           pure (Just (modName, (u, path)), Nothing)
+
+
+  pure $ (Map.fromList a <> notSourceModules, Map.fromList b <> sourceModules)
 
 
 dependencyInfoForFiles :: [NormalizedFilePath] -> Action (BS.ByteString, DependencyInformation)

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

@@ -109,7 +109,6 @@ locateModule moduleMaps@(moduleMap, moduleMapSource) env comp_info exts modName
       -- Reexports for current unit have to be empty because they only apply to other units depending on the
       -- current unit. If we set the reexports to be the actual reexports then we risk looping forever trying
       -- to find the module from the perspective of the current unit.
-      ---- locateModuleFile ((homeUnitId_ dflags, importPaths dflags, S.empty) : other_imports) exts targetFor isSource $ unLoc modName
       --
       -- TODO: handle the other imports, the unit id, ..., reexport.
       --   - TODO: should we look for file existence now? If the file was