diff options
| author | Seth Tisue <seth@tisue.net> | 2015-07-01 15:56:17 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-07-01 15:56:17 -0400 |
| commit | 495fdb8119c1941bc210a9b0a186d63971002e22 (patch) | |
| tree | 2067bf5985fc138577fa7251b0ab7e4a23236a88 /src/compiler | |
| parent | c8fbc41631da0a860f749479a610312814c0e88f (diff) | |
| parent | fac81d705ff0bfdeb3320fd9e46b6d3d34e47ddf (diff) | |
| download | scala-495fdb8119c1941bc210a9b0a186d63971002e22.tar.gz scala-495fdb8119c1941bc210a9b0a186d63971002e22.tar.bz2 scala-495fdb8119c1941bc210a9b0a186d63971002e22.zip | |
Merge pull request #4576 from som-snytt/issue/9206-more
SI-9206 REPL custom bits
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index ca7d8776d4..cb523edfe5 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -12,8 +12,16 @@ object Properties extends scala.util.PropertiesTrait { protected def pickJarBasedOn = classOf[Global] // settings based on jar properties, falling back to System prefixed by "scala." + + // messages to display at startup or prompt, format string with string parameters + // Scala version, Java version, JVM name def residentPromptString = scalaPropOrElse("resident.prompt", "\nnsc> ") def shellPromptString = scalaPropOrElse("shell.prompt", "%nscala> ") + def shellWelcomeString = scalaPropOrElse("shell.welcome", + """Welcome to Scala %1$#s (%3$s, Java %2$s). + |Type in expressions for evaluation. Or try :help.""".stripMargin + ) + // message to display at EOF (which by default ends with // a newline so as not to break the user's terminal) def shellInterruptedString = scalaPropOrElse("shell.interrupted", f":quit$lineSeparator") |