From a9053f429983cc322a2fd2eca8fd0188036c7378 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Wed, 17 Jun 2015 23:25:39 -0700 Subject: SI-9206 Verbose REPL prompt for info mode Only for exactly `-Dscala.repl.info`, include the complete version number string in the REPL prompt. One could imagine this is the mode for posting snippets to stackoverflow. --- src/repl/scala/tools/nsc/interpreter/ReplProps.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/repl/scala/tools/nsc/interpreter/ReplProps.scala b/src/repl/scala/tools/nsc/interpreter/ReplProps.scala index 945129a868..df65e9974d 100644 --- a/src/repl/scala/tools/nsc/interpreter/ReplProps.scala +++ b/src/repl/scala/tools/nsc/interpreter/ReplProps.scala @@ -6,6 +6,7 @@ package scala.tools.nsc package interpreter +import Properties.shellPromptString import scala.sys._ import Prop._ @@ -16,19 +17,19 @@ class ReplProps { // This property is used in TypeDebugging. Let's recycle it. val colorOk = bool("scala.color") + val info = bool("scala.repl.info") + val debug = bool("scala.repl.debug") + val trace = bool("scala.repl.trace") + val power = bool("scala.repl.power") + // Handy system prop for shell prompt, or else pick it up from compiler.properties - val promptString = Prop[String]("scala.repl.prompt").option getOrElse Properties.shellPromptString + val promptString = Prop[String]("scala.repl.prompt").option getOrElse (if (info) "%nscala %s> " else shellPromptString) val prompt = { import scala.io.AnsiColor.{ MAGENTA, RESET } val p = promptString format Properties.versionNumberString if (colorOk) s"$MAGENTA$p$RESET" else p } - val info = bool("scala.repl.info") - val debug = bool("scala.repl.debug") - val trace = bool("scala.repl.trace") - val power = bool("scala.repl.power") - /** CSV of paged,across to enable pagination or `-x` style * columns, "across" instead of down the column. Since * pagination turns off columnar output, these flags are -- cgit v1.2.3