From 8f721b8213f48445d6a864f25b13a30dff1dc7ad Mon Sep 17 00:00:00 2001
From: joshvera <josh@joshvera.com>
Date: Tue, 9 Aug 2016 18:50:57 -0400
Subject: [PATCH] Rener Output in printDiff

---
 src/Diffing.hs | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/Diffing.hs b/src/Diffing.hs
index 3a9f2d12a..b8c4fc593 100644
--- a/src/Diffing.hs
+++ b/src/Diffing.hs
@@ -121,30 +121,38 @@ diffCostWithCachedTermCosts diff = unCost $ case runFree diff of
   Pure patch -> sum (cost . extract <$> patch)
 
 -- | Returns a rendered diff given a parser, diff arguments and two source blobs.
-textDiff :: (Eq (Record fields), HasField fields Category, HasField fields Cost, HasField fields Range) => Parser fields -> DiffArguments -> Both SourceBlob -> IO Text
-textDiff parser arguments sources = case format arguments of
-  Split -> diffFiles parser split sources
-  Patch -> diffFiles parser patch sources
-  JSON -> diffFiles parser json sources
-  Summary -> diffFiles parser summary sources
+textDiff :: (Eq (Record fields), HasField fields Category, HasField fields Cost, HasField fields Range) => Parser fields -> DiffArguments -> Both SourceBlob -> IO Output
+textDiff parser arguments = diffFiles parser renderer
+  where
+    renderer = case format arguments of
+      Split -> split
+      Patch -> patch
+      JSON -> json
+      Summary -> summary
 
 -- | Returns a truncated diff given diff arguments and two source blobs.
-truncatedDiff :: DiffArguments -> Both SourceBlob -> IO Text
-truncatedDiff arguments sources = case format arguments of
-  Split -> pure ""
-  Patch -> pure $ truncatePatch arguments sources
-  JSON -> pure "{}"
-  Summary -> pure ""
+truncatedDiff :: DiffArguments -> Both SourceBlob -> IO Output
+truncatedDiff arguments sources = pure $ case format arguments of
+  Split -> SplitOutput mempty
+  Patch -> PatchOutput (truncatePatch arguments sources)
+  JSON -> JSONOutput mempty
+  Summary -> SummaryOutput mempty
 
 -- | Prints a rendered diff to stdio or a filepath given a parser, diff arguments and two source blobs.
 printDiff :: (Eq (Record fields), HasField fields Category, HasField fields Cost, HasField fields Range) => Parser fields -> DiffArguments -> Both SourceBlob -> IO ()
 printDiff parser arguments sources = do
   rendered <- textDiff parser arguments sources
-  case (output arguments) of
-    Nothing -> TextIO.putStr rendered
+  let renderedText = case rendered of
+                       SplitOutput text -> text
+                       PatchOutput text -> text
+                       JSONOutput series -> toS . encodingToLazyByteString $ pairs series
+                       SummaryOutput summaries -> toS . encodingToLazyByteString $ pairs summaries
+
+  case output arguments of
+    Nothing -> TextIO.putStr renderedText
     Just path -> do
       isDir <- doesDirectoryExist path
       let outputPath = if isDir
           then path </> (takeFileName outputPath -<.> ".html")
           else path
-      IO.withFile outputPath IO.WriteMode (`TextIO.hPutStr` rendered)
+      IO.withFile outputPath IO.WriteMode (`TextIO.hPutStr` renderedText)