Fix purescript#1889, improve performance by avoiding whitespace operations on large strings

paf31 · paf31 · commit 6bb8d5e4cd02 · 2016-03-12T18:33:28.000-08:00
diff --git a/src/Language/PureScript/Errors.hs b/src/Language/PureScript/Errors.hs
@@ -1181,31 +1181,32 @@ prettyPrintRef (PositionedDeclarationRef _ _ ref) = prettyPrintExport ref
 -- Pretty print multiple errors
 --
 prettyPrintMultipleErrors :: Bool -> MultipleErrors -> String
-prettyPrintMultipleErrors full = renderBox . prettyPrintMultipleErrorsBox full
+prettyPrintMultipleErrors full = unlines . map renderBox . prettyPrintMultipleErrorsBox full
 
 -- |
 -- Pretty print multiple warnings
 --
-prettyPrintMultipleWarnings :: Bool -> MultipleErrors ->  String
-prettyPrintMultipleWarnings full = renderBox . prettyPrintMultipleWarningsBox full
+prettyPrintMultipleWarnings :: Bool -> MultipleErrors -> String
+prettyPrintMultipleWarnings full = unlines . map renderBox . prettyPrintMultipleWarningsBox full
 
 -- | Pretty print warnings as a Box
-prettyPrintMultipleWarningsBox :: Bool -> MultipleErrors -> Box.Box
+prettyPrintMultipleWarningsBox :: Bool -> MultipleErrors -> [Box.Box]
 prettyPrintMultipleWarningsBox full = prettyPrintMultipleErrorsWith Warning "Warning found:" "Warning" full
 
 -- | Pretty print errors as a Box
-prettyPrintMultipleErrorsBox :: Bool -> MultipleErrors -> Box.Box
+prettyPrintMultipleErrorsBox :: Bool -> MultipleErrors -> [Box.Box]
 prettyPrintMultipleErrorsBox full = prettyPrintMultipleErrorsWith Error "Error found:" "Error" full
 
-prettyPrintMultipleErrorsWith :: Level -> String -> String -> Bool -> MultipleErrors -> Box.Box
+prettyPrintMultipleErrorsWith :: Level -> String -> String -> Bool -> MultipleErrors -> [Box.Box]
 prettyPrintMultipleErrorsWith level intro _ full (MultipleErrors [e]) =
   let result = prettyPrintSingleError full level True e
-  in Box.vcat Box.left [ Box.text intro
-                       , result
-                       ]
+  in [ Box.vcat Box.left [ Box.text intro
+                         , result
+                         ]
+     ]
 prettyPrintMultipleErrorsWith level _ intro full (MultipleErrors es) =
   let result = map (prettyPrintSingleError full level True) es
-  in Box.vsep 1 Box.left $ concat $ zipWith withIntro [1 :: Int ..] result
+  in concat $ zipWith withIntro [1 :: Int ..] result
   where
   withIntro i err = [ Box.text (intro ++ " " ++ show i ++ " of " ++ show (length es) ++ ":")
                     , Box.moveRight 2 err
diff --git a/src/Language/PureScript/Publish/ErrorsWarnings.hs b/src/Language/PureScript/Publish/ErrorsWarnings.hs
@@ -190,7 +190,7 @@ displayUserError e = case e of
   CompileError err ->
     vcat
       [ para "Compile error:"
-      , indented (P.prettyPrintMultipleErrorsBox False err)
+      , indented (vcat (P.prettyPrintMultipleErrorsBox False err))
       ]
   DirtyWorkingTree ->
     para (

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ displayUserError e = case e of`
`190`	`190`	`CompileError err ->`
`191`	`191`	`vcat`
`192`	`192`	`[ para "Compile error:"`
`193`		`- , indented (P.prettyPrintMultipleErrorsBox False err)`
	`193`	`+ , indented (vcat (P.prettyPrintMultipleErrorsBox False err))`
`194`	`194`	`]`
`195`	`195`	`DirtyWorkingTree ->`
`196`	`196`	`para (`