From 6d7c23016ec866de0b29e9bdde00b60c99df90c2 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Fri, 31 Mar 2017 11:47:47 +0200
Subject: Make DiffUtil's rendering readable in logs

---
 compiler/src/dotty/tools/dotc/util/DiffUtil.scala | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'compiler/src/dotty/tools/dotc/util')

diff --git a/compiler/src/dotty/tools/dotc/util/DiffUtil.scala b/compiler/src/dotty/tools/dotc/util/DiffUtil.scala
index b55aee719..6f7df13a6 100644
--- a/compiler/src/dotty/tools/dotc/util/DiffUtil.scala
+++ b/compiler/src/dotty/tools/dotc/util/DiffUtil.scala
@@ -58,8 +58,25 @@ object DiffUtil {
     (fnd, exp, totalChange.toDouble / (expected.length + found.length))
   }
 
-  def mkColoredCodeDiff(code: String, lastCode: String, printDiffDel: Boolean): String = {
+  def mkColoredLineDiff(expected: String, actual: String): String = {
+    val tokens = splitTokens(expected, Nil).toArray
+    val lastTokens = splitTokens(actual, Nil).toArray
+
+    val diff = hirschberg(lastTokens, tokens)
 
+    "  |SOF\n" + diff.collect {
+      case Unmodified(str) =>
+        "  |" + str
+      case Inserted(str) =>
+        ADDITION_COLOR + "e |" + str + ANSI_DEFAULT
+      case Modified(old, str) =>
+        DELETION_COLOR + "a |" + old + "\ne |" + ADDITION_COLOR + str + ANSI_DEFAULT
+      case Deleted(str) =>
+        DELETION_COLOR + "\na |" + str + ANSI_DEFAULT
+    }.mkString + "\n  |EOF"
+  }
+
+  def mkColoredCodeDiff(code: String, lastCode: String, printDiffDel: Boolean): String = {
     val tokens = splitTokens(code, Nil).toArray
     val lastTokens = splitTokens(lastCode, Nil).toArray
 
-- 
cgit v1.2.3