diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-16 19:40:59 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-16 19:40:59 +0000 |
| commit | d8f3a17f5dd9dd6864b4c6e2ed8db5909e9de2c0 (patch) | |
| tree | 1ef46eb5c62f8803680042713802974e4ab02cdf | |
| parent | 916d5f2de0ddbae60b2a1ae18bb3ab0d96f84897 (diff) | |
| download | scala-d8f3a17f5dd9dd6864b4c6e2ed8db5909e9de2c0.tar.gz scala-d8f3a17f5dd9dd6864b4c6e2ed8db5909e9de2c0.tar.bz2 scala-d8f3a17f5dd9dd6864b4c6e2ed8db5909e9de2c0.zip | |
Go back to printing the message that transcript...
Go back to printing the message that transcript pastes can be finished
with ctrl-D. No review.
| -rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/ILoop.scala | 6 | ||||
| -rw-r--r-- | test/files/run/repl-paste-2.check | 3 | ||||
| -rw-r--r-- | test/files/run/repl-transcript.check | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index 7f1066ec97..b249d37006 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -670,11 +670,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) } def transcript(start: String) = { - // Printing this message doesn't work very well because it's buried in the - // transcript they just pasted. Todo: a short timer goes off when - // lines stop coming which tells them to hit ctrl-D. - // - // echo("// Detected repl transcript paste: ctrl-D to finish.") + echo("\n// Detected repl transcript paste: ctrl-D to finish.\n") apply(Iterator(start) ++ readWhile(_.trim != PromptString.trim)) } } diff --git a/test/files/run/repl-paste-2.check b/test/files/run/repl-paste-2.check index 435592567d..18bd6d2434 100644 --- a/test/files/run/repl-paste-2.check +++ b/test/files/run/repl-paste-2.check @@ -4,6 +4,9 @@ Type :help for more information. scala> scala> scala> 0123 + +// Detected repl transcript paste: ctrl-D to finish. + res4: Int = 0123 scala> 123 diff --git a/test/files/run/repl-transcript.check b/test/files/run/repl-transcript.check index 03162451b6..6d22353882 100644 --- a/test/files/run/repl-transcript.check +++ b/test/files/run/repl-transcript.check @@ -4,6 +4,9 @@ Type :help for more information. scala> scala> scala> class Bippity + +// Detected repl transcript paste: ctrl-D to finish. + defined class Bippity scala> def f = new Bippity |