[color] fixed bug in ANSI color output, revised test file

Author: chrissimpkins

lib/fdiff/color.py

@@ -1,3 +1,5 @@
+import os
+
 ansicolors = {
     "BLACK": "\033[30m",
     "RED": "\033[31m",
@@ -22,8 +24,16 @@ def color_unified_diff_line(line):
     on the unified diff line type."""
     if line[0:2] == "+ ":
         return f"{green_start}{line}{reset}"
+    elif line == f"+{os.linesep}":
+        # some lines are formatted as hyphen only with no other characters
+        # this indicates an added empty line
+        return f"{green_start}{line}{reset}"
     elif line[0:2] == "- ":
         return f"{red_start}{line}{reset}"
+    elif line == f"-{os.linesep}":
+        # some lines are formatted as hyphen only with no other characters
+        # this indicates a deleted empty line
+        return f"{red_start}{line}{reset}"
     elif line[0:3] == "@@ ":
         return f"{cyan_start}{line}{reset}"
     elif line[0:4] == "--- ":

tests/testfiles/roboto_udiff_color_expected.txt

@@ -112,8 +112,8 @@
        </contour>
        <instructions/>
      </TTGlyph>
--
--    <TTGlyph name=".null"/><!-- contains no outline data -->
+-
+-    <TTGlyph name=".null"/><!-- contains no outline data -->
  
      <TTGlyph name="dollar" xMin="110" yMin="-208" xMax="1042" yMax="1692">
        <contour>
@@ -145,14 +145,14 @@
 +      </contour>
 +      <instructions/>
 +    </TTGlyph>
-+
-+    <TTGlyph name="glyph00001"/><!-- contains no outline data -->
-+
-+    <TTGlyph name="glyph00002"/><!-- contains no outline data -->
-+
-+    <TTGlyph name="glyph00003"/><!-- contains no outline data -->
-+
-+    <TTGlyph name="glyph00010" xMin="68" yMin="-237" xMax="990" yMax="1395">
++
++    <TTGlyph name="glyph00001"/><!-- contains no outline data -->
++
++    <TTGlyph name="glyph00002"/><!-- contains no outline data -->
++
++    <TTGlyph name="glyph00003"/><!-- contains no outline data -->
++
++    <TTGlyph name="glyph00010" xMin="68" yMin="-237" xMax="990" yMax="1395">
        <contour>
          <pt x="990" y="300" on="1"/>
          <pt x="990" y="168" on="0"/>
@@ -183,27 +183,27 @@
 -      </contour>
 -      <instructions/>
 -    </TTGlyph>
--
-     <TTGlyph name="numbersign" xMin="119" yMin="0" xMax="1235" yMax="1456">
+-
+     <TTGlyph name="numbersign" xMin="119" yMin="0" xMax="1235" yMax="1456">
        <contour>
          <pt x="686" y="0" on="1"/>
 @@ -478,10 +482,6 @@
  
      <TTGlyph name="space"/><!-- contains no outline data -->
 
 -    <TTGlyph name="uni0002"/><!-- contains no outline data -->
--
--    <TTGlyph name="uni0009"/><!-- contains no outline data -->
--
-   </glyf>
+-
+-    <TTGlyph name="uni0009"/><!-- contains no outline data -->
+-
+   </glyf>
 
    <name>
 @@ -528,33 +528,6 @@
        http://www.apache.org/licenses/LICENSE-2.0
      </namerecord>
    </name>
--
--  <post>
+-
+-  <post>
 -    <formatType value="2.0"/>
 -    <italicAngle value="0.0"/>
 -    <underlinePosition value="-150"/>