Merge remote-tracking branch 'origin/feature/review'main

1 files changed, 22 insertions, 7 deletions

diff --git a/app/Patch.hs b/app/Patch.hs
index 9e6ed88..f170817 100644
--- a/app/Patch.hs
+++ b/app/Patch.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DerivingStrategies #-}
 
 module Patch
-  ( Patch,
+  ( Patch (..),
     parse,
   )
 where
@@ -11,6 +11,7 @@ import Data.Binary (Binary (..))
 import Data.Text qualified as T
 import Exception qualified as E
 import GHC.Generics (Generic)
+import Prettyprinter (pretty)
 import Render ((<<<))
 import Render qualified as P
 import Text.Diff.Extra ()
@@ -31,14 +32,28 @@ instance P.Render Patch where
 
 instance P.Render (P.Detailed Patch) where
   render (P.Detailed (Patch {..})) =
-    P.vsep $ map prettyFileDelta fileDeltas
+    P.vsep (map prettyFileDelta fileDeltas) <<< ("\n" :: T.Text)
     where
-      prettyFileDelta (D.FileDelta {..}) = prettyContent fileDeltaContent
+      prettyFileDelta (D.FileDelta {..}) =
+        ("diff --git " <> fileDeltaSourceFile <> " " <> fileDeltaDestFile <> "\n")
+          <<< (prettySourceFile fileDeltaSourceFile <<< ("\n" :: T.Text))
+          <<< (prettyDestFile fileDeltaDestFile <<< ("\n" :: T.Text))
+          <<< prettyContent fileDeltaContent
+      prettySourceFile file = P.styled [P.bold] $ ("---" :: T.Text) <<< file
+      prettyDestFile file = P.styled [P.bold] $ ("+++" :: T.Text) <<< file
       prettyContent D.Binary = P.emptyDoc
       prettyContent (D.Hunks hunks) = P.vsep (map prettyHunk hunks)
-      prettyHunk (D.Hunk {..}) = P.vsep $ map prettyLine hunkLines
+      prettyHunk (D.Hunk {..}) =
+        P.styled [P.color P.Blue] $
+          (prettySourceRange hunkSourceRange hunkDestRange <<< ("\n" :: T.Text))
+            <<< P.vsep (map prettyLine hunkLines)
+      prettySourceRange srcRange dstRange =
+        ("" :: T.Text) <<< ("@@ -" <> prettyRange srcRange <> " +" <> prettyRange dstRange <> " @@")
+      prettyRange (D.Range line lineNo) =
+        T.pack (show line) <> "," <> T.pack (show lineNo)
       prettyLine (D.Line {..}) =
         case lineAnnotation of
-          D.Added -> P.styled [P.color P.Green] $ P.plus @P.AnsiStyle <<< lineContent
-          D.Removed -> P.styled [P.color P.Red] $ P.minus @P.AnsiStyle <<< lineContent
-          D.Context -> P.styled [P.color P.White] $ P.space @P.AnsiStyle <<< lineContent
+          D.Added -> P.styled [P.color P.Green] $ P.plus @P.AnsiStyle <> pretty lineContent
+          D.Removed -> P.styled [P.color P.Red] $ P.minus @P.AnsiStyle <> pretty lineContent
+          D.Context -> P.styled [P.color P.White] $ P.space @P.AnsiStyle <> pretty lineContent
+          D.Comment -> P.styled [P.color P.White] $ P.hash @P.AnsiStyle <> pretty lineContent