hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix all the stack related things

Browse Source
This commit is contained in:
Daniel Gröber
2015-08-19 06:48:27 +02:00
parent d660e7cd85
commit 78bdf86a95
11 changed files with 75 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Language/Haskell/GhcMod/Target.hs
View File

@@ -182,9 +182,9 @@ resolvedComponentsCache :: IOish m => FilePath ->
Cached (GhcModT m) GhcModState
[GmComponent 'GMCRaw (Set.Set ModulePath)]
(Map.Map ChComponentName (GmComponent 'GMCResolved (Set.Set ModulePath)))
resolvedComponentsCache distDir = Cached {
resolvedComponentsCache distdir = Cached {
cacheLens = Just (lGmcResolvedComponents . lGmCaches),
cacheFile = distDir </> resolvedComponentsCacheFile,
cacheFile = resolvedComponentsCacheFile distdir,
cachedAction = \tcfs comps ma -> do
Cradle {..} <- cradle
let iifsM = invalidatingInputFiles tcfs
@@ -195,13 +195,13 @@ resolvedComponentsCache distDir = Cached {
Just iifs ->
let
filterOutSetupCfg =
filter (/= cradleRootDir </> cradleDistDir </> setupConfigPath)
filter (/= cradleRootDir </> setupConfigPath distdir)
changedFiles = filterOutSetupCfg iifs
in if null changedFiles
then Nothing
else Just $ map Left changedFiles
setupChanged = maybe False
(elem $ cradleRootDir </> cradleDistDir </> setupConfigPath)
(elem $ cradleRootDir </> setupConfigPath distdir)
iifsM
case (setupChanged, ma) of
(False, Just mcs) -> gmsGet >>= \s -> gmsPut s { gmComponents = mcs }
@@ -218,7 +218,7 @@ resolvedComponentsCache distDir = Cached {
text "files changed" <+>: changedDoc
mcs <- resolveGmComponents mums comps
return ((cradleDistDir </> setupConfigPath) : flatten mcs , mcs)
return (setupConfigPath distdir : flatten mcs , mcs)
}
where