Fix highlighting of the 'Merge:' line in merge commits

Author: da-x

src/Fancydiff/AnsiFormatting.hs

@@ -41,6 +41,7 @@ data RenderedPalette = RenderedPalette {
     , p'parentheses      :: {-# UNPACK #-} !Text
     , p'ignore           :: {-# UNPACK #-} !Text
     , p'commitMain       :: {-# UNPACK #-} !Text
+    , p'commitMerge      :: {-# UNPACK #-} !Text
     , p'commitOther      :: {-# UNPACK #-} !Text
     , p'commitMsgByLines :: {-# UNPACK #-} !Text
     , p'diffMain         :: {-# UNPACK #-} !Text
@@ -72,6 +73,8 @@ renderPalette brightness p = RenderedPalette
     , p'parentheses           = front D.p'parentheses
     , p'ignore                = front D.p'ignore
     , p'commitMain            = wrap $ back D.p'commitMain
+    , p'commitMerge           = wrap $ T.concat [back D.p'commitMain,
+                                                 front D.p'commitMergeFG]
     , p'commitOther           = wrap $ back D.p'commitOther
     , p'commitMsgByLines      = front D.p'commitMsgByLines
     , p'diffMain              = wrap $ back D.p'diffMain
@@ -170,6 +173,7 @@ ansiFormatting = root
         repr _ _ _ DiffNothing        = Nothing
         repr _ _ _ CommitMsgByLines   = Just $ p'commitMsgByLines pal
         repr _ _ _ CommitMain         = Just $ p'commitMain pal
+        repr _ _ _ CommitMerge        = Just $ p'commitMerge pal
         repr _ _ _ CommitOther        = Just $ p'commitOther pal
 
         repr _ _ r (Style Ignore)     = r

src/Fancydiff/Data.hs

@@ -43,6 +43,7 @@ data Format
     | DiffUnchanged
     | DiffNothing
     | CommitMain
+    | CommitMerge
     | CommitOther
     | CommitMsgByLines
     | Mark
@@ -79,6 +80,7 @@ data Palette a = Palette {
     , p'parentheses      :: !a
     , p'ignore           :: !a
     , p'commitMsgByLines :: !a
+    , p'commitMergeFG    :: !a
     , p'commitMain       :: !a
     , p'commitOther      :: !a
     , p'diffMain         :: !a

src/Fancydiff/Lib.hs

@@ -198,12 +198,13 @@ commitHighlight commit = do
     where
         parsed       = parse $ lineSplit commit
 
-        parse (x:xs) = case' "commit "   (const FD.CommitMain) parse x xs $
-                       case' "Author: "  (const FD.CommitOther) parse x xs $
-                       case' "AuthorDate: "  (const FD.CommitOther) parse x xs $
-                       case' "Commit: "  (const FD.CommitOther) parse x xs $
-                       case' "CommitDate: "  (const FD.CommitOther) parse x xs $
-                       case' "Date: "    (const FD.CommitOther) parse x xs $
+        parse (x:xs) = case' "commit "            (const FD.CommitMain) parse x xs $
+                       case' "Merge: "            (const FD.CommitMerge) parse x xs $
+                       case' "Author: "           (const FD.CommitOther) parse x xs $
+                       case' "AuthorDate: "       (const FD.CommitOther) parse x xs $
+                       case' "Commit: "           (const FD.CommitOther) parse x xs $
+                       case' "CommitDate: "       (const FD.CommitOther) parse x xs $
+                       case' "Date: "             (const FD.CommitOther) parse x xs $
                        case' "    Signed-off-by:" (const CommitMsgByLines) parse x xs $
                        else' parse x xs
         parse []     = []

src/Fancydiff/Themes.hs

@@ -25,6 +25,7 @@ darkBackground = Palette {
     , p'parentheses      = ColorString "#c0f0f0"
     , p'ignore           = ColorString "#ffffff"
     , p'commitMain       = ColorString "#702070"
+    , p'commitMergeFG    = ColorString "#ffff00"
     , p'commitOther      = ColorString "#502050"
     , p'commitMsgByLines = ColorString "#ffbbff"
     , p'diffMain         = ColorString "#0020a0"