Change to color all hunks in one pass

piotrmurach · Jul 27, 2020 · 4f1dadd · 4f1dadd
1 parent b67220e
commit 4f1dadd
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/lib/tty/file/compare_files.rb b/lib/tty/file/compare_files.rb
@@ -39,11 +39,11 @@ def call(file_a, file_b, file_a_path, file_b_path)
         end
 
         output << "\n" unless hunks =~ /\A\n+@@/
-        output << color_diff_lines(hunks, color: @color, format: @format)
+        output << hunks
         while !file_a.eof? && !file_b.eof?
           output << differ.(file_a.read(block_size), file_b.read(block_size))
         end
-        output.join
+        color_diff_lines(output.join, color: @color, format: @format)
       end
 
       private
@@ -53,9 +53,17 @@ def color_diff_lines(hunks, color: true, format: :unified)
         return hunks unless color && format == :unified
 
         newline = "\n"
-        hunks.gsub(/^(\+[^+].*?)\n/, decorate("\\1", :green) + newline)
-            .gsub(/^(\-[^-].*?)\n/, decorate("\\1", :red) + newline)
-            .gsub(/^(@.+?)\n/, decorate("\\1", :cyan) + newline)
+        hunks.lines.map do |line|
+          if matched = line.to_s.match(/^(\+[^+]*?)\n/)
+            decorate(matched[1], :green) + newline
+          elsif matched = line.to_s.match(/^(\-[^-].*?)\n/)
+            decorate(matched[1], :red) + newline
+          elsif matched = line.to_s.match(/^(@@.+?@@)\n/)
+            decorate(matched[1], :cyan) + newline
+          else
+            line
+          end
+        end.join
       end
 
       def decorate(*args)