From f9db9097d0cf314d675669d80f8d5eb8d20f0710 Mon Sep 17 00:00:00 2001
From: Felix Mulder <felix.mulder@gmail.com>
Date: Thu, 30 Mar 2017 17:33:06 +0200
Subject: Fix #2151: don't die for wrong number of typeargs applied

---
 compiler/src/dotty/tools/dotc/core/Decorators.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/src')

diff --git a/compiler/src/dotty/tools/dotc/core/Decorators.scala b/compiler/src/dotty/tools/dotc/core/Decorators.scala
index f8267072e..0e8ae196a 100644
--- a/compiler/src/dotty/tools/dotc/core/Decorators.scala
+++ b/compiler/src/dotty/tools/dotc/core/Decorators.scala
@@ -103,7 +103,7 @@ object Decorators {
      *  as long as `xs`.
      */
     def zipWithConserve[U](ys: List[U])(f: (T, U) => T): List[T] =
-      if (xs.isEmpty) xs
+      if (xs.isEmpty || ys.isEmpty) Nil
       else {
         val x1 = f(xs.head, ys.head)
         val xs1 = xs.tail.zipWithConserve(ys.tail)(f)
-- 
cgit v1.2.3


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

---
 .../dotty/tools/dotc/reporting/MessageRendering.scala |  2 +-
 compiler/src/dotty/tools/dotc/util/DiffUtil.scala     | 19 ++++++++++++++++++-
 compiler/test/dotty/tools/dotc/ParallelTesting.scala  |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'compiler/src')

diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
index 17eb8d39b..91e65ab66 100644
--- a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
+++ b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -21,7 +21,7 @@ trait MessageRendering {
     * @return string stripped of ANSI escape codes
     */
   def stripColor(str: String): String =
-    str.replaceAll("\u001B\\[[;\\d]*m", "")
+    str.replaceAll("\u001b\\[.*?m", "")
 
   /** When inlining a method call, if there's an error we'd like to get the
     * outer context and the `pos` at which the call was inlined.
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
 
diff --git a/compiler/test/dotty/tools/dotc/ParallelTesting.scala b/compiler/test/dotty/tools/dotc/ParallelTesting.scala
index 289351d81..8e87c1170 100644
--- a/compiler/test/dotty/tools/dotc/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/dotc/ParallelTesting.scala
@@ -456,7 +456,7 @@ trait ParallelTesting { self =>
       if (outputLines.length != checkLines.length || !linesMatch) {
         // Print diff to files and summary:
         val diff = outputLines.zip(checkLines).map { case (act, exp) =>
-          DiffUtil.mkColoredCodeDiff(exp, act, true)
+          DiffUtil.mkColoredLineDiff(exp, act)
         }.mkString("\n")
         val msg = s"\nOutput from run test '$checkFile' did not match expected, output:\n$diff\n"
         echo(msg)
-- 
cgit v1.2.3