Merge branch 'master' into ghc-8

2016-05-17 20:21:25 +02:00
parent d3f66500ed e495c55a8d
commit 9eeaf09095
22 changed files with 357 additions and 214 deletions
--- a/Language/Haskell/GhcMod/Target.hs
+++ b/Language/Haskell/GhcMod/Target.hs
@@ -466,7 +466,9 @@ loadTargets opts targetStrs = do
    case target' of
      HscNothing -> do
        void $ load LoadAllTargets
-        mapM_ (parseModule >=> typecheckModule >=> desugarModule) mg
+        forM_ mg $
+          handleSourceError (gmLog GmDebug "loadTargets" . text . show)
+          . void . (parseModule >=> typecheckModule >=> desugarModule)
      HscInterpreted -> do
        void $ load LoadAllTargets
      _ -> error ("loadTargets: unsupported hscTarget")