Use magenta/yellow in favor of red/green

Using red for expected and green for actual value implies that the
actual is "correct" and the expected value is "incorrect". However, it
could very well be that it is it the reverse. Using different colors
looks "strange", but it is technically more accurate.

Author: mcmire

lib/super_diff.rb

@@ -3,7 +3,10 @@
 require "patience_diff"
 
 module SuperDiff
-  autoload :ColorizedDocumentExtensions, "super_diff/colorized_document_extensions"
+  autoload(
+    :ColorizedDocumentExtensions,
+    "super_diff/colorized_document_extensions",
+  )
   autoload :Csi, "super_diff/csi"
   autoload :DiffFormatter, "super_diff/diff_formatter"
   autoload :DiffFormatters, "super_diff/diff_formatters"
@@ -23,4 +26,11 @@ module SuperDiff
   autoload :OperationSequences, "super_diff/operation_sequences"
   autoload :Operations, "super_diff/operations"
   autoload :RecursionGuard, "super_diff/recursion_guard"
+
+  COLORS = {
+    alpha: :magenta,
+    beta: :yellow,
+    border: :blue,
+    header: :white,
+  }.freeze
 end

lib/super_diff/colorized_document_extensions.rb

@@ -6,12 +6,12 @@ def self.extended(extendee)
       end
     end
 
-    def deleted(*args, **opts, &block)
-      colorize(*args, **opts, fg: :red, &block)
+    def alpha(*args, **opts, &block)
+      colorize(*args, **opts, fg: SuperDiff::COLORS.fetch(:alpha), &block)
     end
 
-    def inserted(*args, **opts, &block)
-      colorize(*args, **opts, fg: :green, &block)
+    def beta(*args, **opts, &block)
+      colorize(*args, **opts, fg: SuperDiff::COLORS.fetch(:beta), &block)
     end
   end
 end

lib/super_diff/diff_formatters/collection.rb

@@ -4,7 +4,7 @@ class Collection
       extend AttrExtras.mixin
 
       ICONS = { delete: "-", insert: "+" }.freeze
-      STYLES = { insert: :inserted, delete: :deleted, noop: :normal }.freeze
+      STYLES = { insert: :beta, delete: :alpha, noop: :plain }.freeze
 
       method_object(
         [

lib/super_diff/diff_formatters/multiline_string.rb

@@ -15,14 +15,14 @@ def lines
         operations.reduce([]) do |array, operation|
           case operation.name
           when :change
-            array << Helpers.style(:deleted, "- #{operation.left_value}")
-            array << Helpers.style(:inserted, "+ #{operation.right_value}")
+            array << Helpers.style(:alpha, "- #{operation.left_value}")
+            array << Helpers.style(:beta, "+ #{operation.right_value}")
           when :delete
-            array << Helpers.style(:deleted, "- #{operation.value}")
+            array << Helpers.style(:alpha, "- #{operation.value}")
           when :insert
-            array << Helpers.style(:inserted, "+ #{operation.value}")
+            array << Helpers.style(:beta, "+ #{operation.value}")
           else
-            array << Helpers.style(:normal, "  #{operation.value}")
+            array << Helpers.style(:plain, "  #{operation.value}")
           end
         end
       end

lib/super_diff/equality_matchers/array.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :deleted,
+              :alpha,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
+              :beta,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/default.rb

@@ -19,15 +19,15 @@ def fail
 
       def expected_line
         Helpers.style(
-          :deleted,
+          :alpha,
           "Expected: " +
           ObjectInspection.inspect(expected, as_single_line: true),
         )
       end
 
       def actual_line
         Helpers.style(
-          :inserted,
+          :beta,
           "  Actual: " +
           ObjectInspection.inspect(actual, as_single_line: true),
         )

lib/super_diff/equality_matchers/hash.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :deleted,
+              :alpha,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
+              :beta,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/multiline_string.rb

@@ -12,14 +12,14 @@ def fail
           #{
             # TODO: This whole thing should not be red or green, just the values
             Helpers.style(
-              :deleted,
+              :alpha,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
+              :beta,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/primitive.rb

@@ -15,14 +15,14 @@ def fail
 
           #{
             Helpers.style(
-              :deleted,
+              :alpha,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
+              :beta,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )

lib/super_diff/equality_matchers/singleline_string.rb

@@ -11,14 +11,14 @@ def fail
 
           #{
             Helpers.style(
-              :deleted,
+              :alpha,
               "Expected: " +
               ObjectInspection.inspect(expected, as_single_line: true),
             )
           }
           #{
             Helpers.style(
-              :inserted,
+              :beta,
               "  Actual: " +
               ObjectInspection.inspect(actual, as_single_line: true),
             )