haskell/ghcide
1
1
Fork 0
mirror of https://github.com/haskell/ghcide.git synced 2024-09-20 01:57:38 +03:00
Code Issues Projects Releases Wiki Activity

Feedback from PR to improve import path finding (#1188)

Browse Source 
* Feedback from PR to improve import path finding

* Update compiler/haskell-ide-core/src/Development/IDE/Functions/Compile.hs
This commit is contained in:
Neil Mitchell 2019-05-16 15:14:08 +01:00 committed by GitHub
parent 718e3389c8
commit 749ee7d699
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Development/IDE/Functions/Compile.hs
View File

@ -241,22 +241,21 @@ runGhcSession
-> Ghc a
-> IO a
runGhcSession IdeOptions{..} modu env act = runGhcEnv env $ do
modifyDynFlags $ \x -> x{importPaths = maybe [] moduleImportPaths modu ++ importPaths x}
modifyDynFlags $ \x -> x
{importPaths = nubOrd $ maybeToList (moduleImportPaths =<< modu) ++ importPaths x}
act
moduleImportPaths :: GHC.ParsedModule -> [FilePath]
moduleImportPaths pm =
maybe [] (\modRoot -> [modRoot]) mbModuleRoot
moduleImportPaths :: GHC.ParsedModule -> Maybe FilePath
moduleImportPaths pm
| rootModDir == "." = Just rootPathDir
| otherwise = dropTrailingPathSeparator <$> stripSuffix rootModDir rootPathDir
where
ms = GHC.pm_mod_summary pm
file = GHC.ms_hspp_file ms
mod' = GHC.ms_mod ms
rootPathDir = takeDirectory file
rootModDir = takeDirectory . moduleNameSlashes . GHC.moduleName $ mod'
mbModuleRoot
| rootModDir == "." = Just rootPathDir
| otherwise = dropTrailingPathSeparator <$> stripSuffix rootModDir rootPathDir
-- When we make a fresh GHC environment, the OrigNameCache comes already partially