diff --git a/compiler/utils/Outputable.lhs b/compiler/utils/Outputable.lhs index 162c253b6b913570165cd273c20f80dbed436607..c563aa592a0a0f0a23fe05fe18a7da97bf24e7fd 100644 --- a/compiler/utils/Outputable.lhs +++ b/compiler/utils/Outputable.lhs @@ -352,10 +352,10 @@ printForUser dflags handle unqual doc = Pretty.printDoc PageMode handle (runSDoc doc (initSDocContext' dflags (mkUserStyle unqual AllTheWay))) -printForUserPartWay :: Handle -> Int -> PrintUnqualified -> SDoc -> IO () -printForUserPartWay handle d unqual doc +printForUserPartWay :: DynFlags -> Handle -> Int -> PrintUnqualified -> SDoc -> IO () +printForUserPartWay dflags handle d unqual doc = Pretty.printDoc PageMode handle - (runSDoc doc (initSDocContext (mkUserStyle unqual (PartWay d)))) + (runSDoc doc (initSDocContext' dflags (mkUserStyle unqual (PartWay d)))) -- printForC, printForAsm do what they sound like printForC :: Handle -> SDoc -> IO () diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index 06ef4112626695446f336a531f785847b1ba5ef6..90797cbb809c7c0ace23d852418be0fe7d8e64e3 100644 --- a/ghc/GhciMonad.hs +++ b/ghc/GhciMonad.hs @@ -245,7 +245,8 @@ printForUser doc = do printForUserPartWay :: SDoc -> GHCi () printForUserPartWay doc = do unqual <- GHC.getPrintUnqual - liftIO $ Outputable.printForUserPartWay stdout opt_PprUserLength unqual doc + dflags <- getSessionDynFlags + liftIO $ Outputable.printForUserPartWay dflags stdout opt_PprUserLength unqual doc runStmt :: String -> GHC.SingleStep -> GHCi GHC.RunResult runStmt expr step = do