Print details of panic messages raised from GHCi (#7844)

78d56448 · parcs · ian@well-typed.com · 157ac08b · 78d56448
Commit 78d56448 authored Apr 17, 2013 by parcs Committed by ian@well-typed.com Apr 21, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

ghc/InteractiveUI.hs ghc/InteractiveUI.hs +4 -3

No files found.
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -2947,9 +2947,10 @@ showException se =
 -- in an exception loop (eg. let a = error a in a) the ^C exception
 -- may never be delivered.  Thanks to Marcin for pointing out the bug.

-ghciHandle :: ExceptionMonad m => (SomeException -> m a) -> m a -> m a
-ghciHandle h m = gmask $ \restore ->
-                 gcatch (restore m) $ \e -> restore (h e)
+ghciHandle :: (HasDynFlags m, ExceptionMonad m) => (SomeException -> m a) -> m a -> m a
+ghciHandle h m = gmask $ \restore -> do
+                 dflags <- getDynFlags
+                 gcatch (restore (GHC.prettyPrintGhcErrors dflags m)) $ \e -> restore (h e)

 ghciTry :: GHCi a -> GHCi (Either SomeException a)
 ghciTry (GHCi m) = GHCi $ \s -> gtry (m s)