diff options
| author | Antoine Gourlay <antoine@gourlay.fr> | 2014-07-29 18:12:42 +0200 |
|---|---|---|
| committer | Antoine Gourlay <antoine@gourlay.fr> | 2014-07-29 20:04:33 +0200 |
| commit | ed9dfee181e56bb83afa0598523786bee5572068 (patch) | |
| tree | cb11f1943a15412eb294ce0dab01b9d1a4ae4d4d /test/files/run/repl-javap-app.check | |
| parent | 84d4ebc19a1e54dbe446ef35b71efa7ad3890c19 (diff) | |
| download | scala-ed9dfee181e56bb83afa0598523786bee5572068.tar.gz scala-ed9dfee181e56bb83afa0598523786bee5572068.tar.bz2 scala-ed9dfee181e56bb83afa0598523786bee5572068.zip | |
SI-4563 friendlier behavior for Ctrl+D in the REPL
Closing the REPL with Ctrl+D does not issue a newline, so the user's
prompt displays on the same line as the `scala>` prompt. This is bad.
We now force a newline before closing the interpreter, and display
`:quit` while we're at it so that people know how to exit the REPL
(since `exit` doesn't exist anymore).
The tricky part was to only add a newline when the console is
interrupted, and *not* when it is closed by a command (like `:quit`),
since commands are processed after their text (including newline) has
been sent to the console.
Diffstat (limited to 'test/files/run/repl-javap-app.check')
| -rw-r--r-- | test/files/run/repl-javap-app.check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/repl-javap-app.check b/test/files/run/repl-javap-app.check index 1136b415d7..eb3718f44b 100644 --- a/test/files/run/repl-javap-app.check +++ b/test/files/run/repl-javap-app.check @@ -15,7 +15,7 @@ public final void delayedEndpoint$MyApp$1(); Start Length Slot Name Signature 0 9 0 this LMyApp$; -scala> +scala> :quit #partest java7 Welcome to Scala Type in expressions to have them evaluated. @@ -37,7 +37,7 @@ scala> :javap -app MyApp$ line 5: 0 } -scala> +scala> :quit #partest java8 Welcome to Scala Type in expressions to have them evaluated. @@ -60,4 +60,4 @@ scala> :javap -app MyApp$ line 5: 0 } -scala> +scala> :quit |