Merge pull request #26 from Wizek/master

Indent pretty-printed strings and custom show instances

src/Text/Pretty/Simple.hs

@@ -204,6 +204,35 @@ pStringNoColor = pStringOpt defaultOutputOptionsNoColor
 --  ( "hello"
 --  , "bye"
 --  )
+--
+-- Lines in strings get indented
+--
+-- >>> pPrintOpt defaultOutputOptionsNoColor (1, (2, "foo\nbar\nbaz", 3))
+-- ( 1
+-- ,
+--     ( 2
+--     , "foo
+--       bar
+--       baz"
+--     , 3
+--     )
+-- )
+--
+-- Lines get indented even in custom show instances
+--
+-- >>> data Foo = Foo
+-- >>> instance Show Foo where show _ = "foo\nbar\nbaz"
+-- >>> pPrintOpt defaultOutputOptionsNoColor (1, (2, Foo, 3))
+-- ( 1
+-- ,
+--     ( 2
+--     , foo
+--       bar
+--       baz
+--     , 3
+--     )
+-- )
+
 pPrintOpt :: (MonadIO m, Show a) => OutputOptions -> a -> m ()
 pPrintOpt outputOptions = liftIO . LText.putStrLn . pShowOpt outputOptions
 

src/Text/Pretty/Simple/Internal/OutputPrinter.hs

@@ -31,6 +31,7 @@ import Data.Foldable (fold, foldlM)
 import Data.Text.Lazy (Text)
 import Data.Text.Lazy.Builder (Builder, fromString, toLazyText)
 import Data.Typeable (Typeable)
+import Data.List (intercalate)
 import GHC.Generics (Generic)
 
 import Text.Pretty.Simple.Internal.Color
@@ -108,23 +109,43 @@ renderOutput (Output _ OutputNewLine) = pure "\n"
 renderOutput (Output nest OutputOpenBrace) = renderRaibowParenFor nest "{"
 renderOutput (Output nest OutputOpenBracket) = renderRaibowParenFor nest "["
 renderOutput (Output nest OutputOpenParen) = renderRaibowParenFor nest "("
-renderOutput (Output _ (OutputOther string)) =
+renderOutput (Output _ (OutputOther string)) = do
+  indentSpaces <- reader outputOptionsIndentAmount
+  let spaces = replicate (indentSpaces + 2) ' '
   -- TODO: This probably shouldn't be a string to begin with.
-  pure $ fromString string
+  pure $ fromString $ indentSubsequentLinesWith spaces string
 renderOutput (Output _ (OutputStringLit string)) = do
+  indentSpaces <- reader outputOptionsIndentAmount
+  let spaces = replicate (indentSpaces + 2) ' '
+
   sequenceFold
     [ useColorQuote
     , pure "\""
     , useColorReset
     , useColorString
     -- TODO: This probably shouldn't be a string to begin with.
-    , pure $ fromString string
+    , pure $ fromString $ indentSubsequentLinesWith spaces string
     , useColorReset
     , useColorQuote
     , pure "\""
     , useColorReset
     ]
 
+-- |
+-- >>> indentSubsequentLinesWith "  " "aaa"
+-- "aaa"
+--
+-- >>> indentSubsequentLinesWith "  " "aaa\nbbb\nccc"
+-- "aaa\n  bbb\n  ccc"
+--
+-- >>> indentSubsequentLinesWith "  " ""
+-- ""
+indentSubsequentLinesWith :: String -> String -> String
+indentSubsequentLinesWith indent input =
+  intercalate "\n" $ (start ++) $ map (indent ++) $ end
+  where (start, end) = splitAt 1 $ lines input
+
+
 -- | Produce a 'Builder' corresponding to the ANSI escape sequence for the
 -- color for the @\"@, based on whether or not 'outputOptionsColorOptions' is
 -- 'Just' or 'Nothing', and the value of 'colorQuote'.