From 28cbce5a6f00f600225c9b3787b564c39484beba Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Thu, 13 Apr 2017 16:29:18 +0200 Subject: Fix #2245: strip colors from strings before writing to file --- compiler/test/dotty/tools/dotc/reporting/TestReporter.scala | 13 +------------ compiler/test/dotty/tools/vulpix/SummaryReport.scala | 7 +++++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala index 213181b56..d07d31c74 100644 --- a/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala +++ b/compiler/test/dotty/tools/dotc/reporting/TestReporter.scala @@ -28,18 +28,7 @@ extends Reporter with UniqueMessagePositions with HideNonSensicalMessages with M private[this] var _didCrash = false final def compilerCrashed: Boolean = _didCrash - final def flushToFile(): Unit = - _messageBuf - .iterator - .map(_.replaceAll("\u001b\\[.*?m", "")) - .foreach(filePrintln) - - final def flushToStdErr(): Unit = - _messageBuf - .iterator - .foreach(System.err.println) - - final def inlineInfo(pos: SourcePosition): String = + protected final def inlineInfo(pos: SourcePosition): String = if (pos.exists) { if (pos.outer.exists) s"\ninlined at ${pos.outer}:\n" + inlineInfo(pos.outer) diff --git a/compiler/test/dotty/tools/vulpix/SummaryReport.scala b/compiler/test/dotty/tools/vulpix/SummaryReport.scala index 678d88809..dae83c13d 100644 --- a/compiler/test/dotty/tools/vulpix/SummaryReport.scala +++ b/compiler/test/dotty/tools/vulpix/SummaryReport.scala @@ -131,11 +131,14 @@ final class SummaryReport extends SummaryReporting { if (cleanUps.nonEmpty) cleanUps.foreach(_.apply()) } + private def removeColors(msg: String): String = + msg.replaceAll("\u001b\\[.*?m", "") + def echoToLog(msg: String): Unit = - TestReporter.logPrintln(msg) + TestReporter.logPrintln(removeColors(msg)) def echoToLog(it: Iterator[String]): Unit = { - it.foreach(TestReporter.logPrint) + it.foreach(msg => TestReporter.logPrint(removeColors(msg))) TestReporter.logFlush() } } -- cgit v1.2.3