diff options
| author | Som Snytt <som.snytt@gmail.com> | 2015-06-25 10:16:58 -0700 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2015-06-25 13:07:00 -0700 |
| commit | fac81d705ff0bfdeb3320fd9e46b6d3d34e47ddf (patch) | |
| tree | eccc4aa950ce91fce9ba8a73abc57dee08f9f36d /src/partest-extras/scala/tools | |
| parent | 91243694982f10d6061edac562b9af32b7bc9f4f (diff) | |
| download | scala-fac81d705ff0bfdeb3320fd9e46b6d3d34e47ddf.tar.gz scala-fac81d705ff0bfdeb3320fd9e46b6d3d34e47ddf.tar.bz2 scala-fac81d705ff0bfdeb3320fd9e46b6d3d34e47ddf.zip | |
SI-9206 De-perk the welcome message
The welcome message defaults to a sober header followed by
one line of instructions.
Diffstat (limited to 'src/partest-extras/scala/tools')
| -rw-r--r-- | src/partest-extras/scala/tools/partest/ReplTest.scala | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/partest-extras/scala/tools/partest/ReplTest.scala b/src/partest-extras/scala/tools/partest/ReplTest.scala index 756ae21b43..20dfe0eb16 100644 --- a/src/partest-extras/scala/tools/partest/ReplTest.scala +++ b/src/partest-extras/scala/tools/partest/ReplTest.scala @@ -34,13 +34,15 @@ abstract class ReplTest extends DirectTest { log("eval(): settings = " + s) val lines = ILoop.runForTranscript(code, s, inSession = inSession).lines (if (welcoming) { - val welcome = Regex.quote(header.lines.next).r - val version = "(.*version).*".r - var inHead = false + val welcome = "(Welcome to Scala).*".r + //val welcome = Regex.quote(header.lines.next).r + //val version = "(.*version).*".r // version on separate line? + //var inHead = false lines map { - case s @ welcome() => inHead = true ; s - case version(s) if inHead => inHead = false ; s - case s => s + //case s @ welcome() => inHead = true ; s + //case version(s) if inHead => inHead = false ; s + case welcome(s) => s + case s => s } } else { lines drop header.lines.size |