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

Merge branch 'Fix502' of https://github.com/acowley/ghc-mod

This commit is contained in:
Daniel Gröber 2015-08-03 05:48:15 +02:00
parent 84c0670fc4 e06e4d25df
commit 6ef389a757
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,8 +201,9 @@ resolvedComponentsCache = Cached {
cacheFile = resolvedComponentsCacheFile,
cachedAction = \tcfs comps ma -> do
Cradle {..} <- cradle
let mums =
case invalidatingInputFiles tcfs of
let iifsM = invalidatingInputFiles tcfs
mums =
case iifsM of
Nothing -> Nothing
Just iifs ->
let
@ -212,10 +213,12 @@ resolvedComponentsCache = Cached {
in if null changedFiles
then Nothing
else Just $ map Left changedFiles
case ma of
Just mcs -> gmsGet >>= \s -> gmsPut s { gmComponents = mcs }
Nothing -> return ()
setupChanged = maybe False
(elem $ cradleRootDir </> setupConfigPath)
iifsM
case (setupChanged, ma) of
(False, Just mcs) -> gmsGet >>= \s -> gmsPut s { gmComponents = mcs }
_ -> return ()
-- liftIO $ print ("changed files", mums :: Maybe [Either FilePath ()])