Add --show-no-spaces. Fixes #173

Author: jeffkaufman

icdiff

@@ -99,6 +99,7 @@ class ConsoleDiff(object):
         cols=80,
         line_numbers=False,
         show_all_spaces=False,
+        show_no_spaces=False,
         highlight=False,
         truncate=False,
         strip_trailing_cr=False,
@@ -118,6 +119,7 @@ class ConsoleDiff(object):
         self.line_numbers = line_numbers
         self.cols = cols
         self.show_all_spaces = show_all_spaces
+        self.show_no_spaces = show_no_spaces
         self.highlight = highlight
         self.strip_trailing_cr = strip_trailing_cr
         self.truncate = truncate
@@ -469,7 +471,15 @@ class ConsoleDiff(object):
         if self.highlight:
             return s
 
-        if not self.show_all_spaces:
+        if self.show_no_spaces:
+            # Don't show whitespace even if it's a whitespace-only line.
+            return re.sub(
+                "\033\\[[01];3([01234567])m(\\s+)(\033\\[)",
+                "\033[0;3\\1m\\2\\3",
+                s,
+            )
+
+        elif not self.show_all_spaces:
             # If there's a change consisting entirely of whitespace,
             # don't color it.
             return re.sub(
@@ -643,6 +653,12 @@ def create_option_parser():
         "that which is not needed for drawing the eye to "
         "changes.  Slow, ugly, displays all changes",
     )
+    parser.add_option(
+        "--show-no-spaces",
+        default=False,
+        action="store_true",
+        help="don't color whitespace-only changes"
+    )
     parser.add_option("--tabsize", default=8, help="tab stop spacing")
     parser.add_option(
         "-t",
@@ -990,6 +1006,7 @@ def diff_files(options, a, b):
     cd = ConsoleDiff(
         cols=int(options.cols),
         show_all_spaces=options.show_all_spaces,
+        show_no_spaces=options.show_no_spaces,
         highlight=options.highlight,
         line_numbers=options.line_numbers,
         tabsize=int(options.tabsize),

test.sh

@@ -128,6 +128,9 @@ check_gold 1 gold-45-h.txt            tests/input-{4,5}.txt --cols=80 --highligh
 check_gold 1 gold-45-nb.txt           tests/input-{4,5}.txt --cols=80 --no-bold
 check_gold 1 gold-45-sas-h.txt        tests/input-{4,5}.txt --cols=80 --show-all-spaces --highlight
 check_gold 1 gold-45-sas-h-nb.txt     tests/input-{4,5}.txt --cols=80 --show-all-spaces --highlight --no-bold
+check_gold 1 gold-sas.txt             tests/input-{10,11}.txt --cols=80 --show-all-spaces
+check_gold 1 gold-sns.txt             tests/input-{10,11}.txt --cols=80 --show-no-spaces
+check_gold 1 gold-show-spaces.txt     tests/input-{10,11}.txt --cols=80
 check_gold 1 gold-45-h-nb.txt         tests/input-{4,5}.txt --cols=80 --highlight --no-bold
 check_gold 1 gold-45-ln.txt           tests/input-{4,5}.txt --cols=80 --line-numbers
 check_gold 1 gold-45-ln-color.txt     tests/input-{4,5}.txt --cols=80 --line-numbers --color-map='line-numbers:cyan'

tests/gold-sas.txt

@@ -0,0 +1,11 @@
+tests/input-10.txt                      tests/input-11.txt                     
+void main ()                            void main ()                           
+{                                       {                                      
+  int x;                                  int x;                               
+  int y;                                  int y;                               
+}                                       }                                      
+                                                                               
+                                        void foo ()                            
+                                        {                                      
+                                                                               
+                                        }                                      

tests/gold-show-spaces.txt

@@ -0,0 +1,11 @@
+tests/input-10.txt                      tests/input-11.txt                     
+void main ()                            void main ()                           
+{                                       {                                      
+  int x;                                  int x;                               
+  int y;                                  int y;                               
+}                                       }                                      
+                                                                               
+                                        void foo ()                            
+                                        {                                      
+                                                                               
+                                        }                                      

tests/gold-sns.txt

@@ -0,0 +1,11 @@
+tests/input-10.txt                      tests/input-11.txt                     
+void main ()                            void main ()                           
+{                                       {                                      
+  int x;                                  int x;                               
+  int y;                                  int y;                               
+}                                       }                                      
+                                                                               
+                                        void foo ()                            
+                                        {                                      
+                                                                               
+                                        }                                      

tests/input-10.txt

@@ -0,0 +1,5 @@
+void main ()
+{
+  int x;
+  int y;
+}

tests/input-11.txt

@@ -0,0 +1,10 @@
+void main ()
+{
+  int x;
+  int y;
+}
+
+void foo ()
+{
+
+}