scala · lrytz · Dec 18, 2018 · Dec 15, 2018
diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/ILoop.scala
@@ -525,10 +525,15 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
   def replay(): Unit = {
     if (replayCommandStack.isEmpty)
       echo("Nothing to replay.")
-    else for (cmd <- replayCommands) {
-      echo("Replaying: " + cmd)  // flush because maybe cmd will have its own output
-      command(cmd)
-      echo("")
+    else {
+      val reprompt = "replay> "
+      intp.reporter.indenting(reprompt.length) {
+        for (cmd <- replayCommands) {
+          echo(s"$reprompt$cmd")
+          command(cmd)
+          echo("") // flush because maybe cmd will have its own output
+        }
+      }
     }
   }
   /** `reset` the interpreter in an attempt to start fresh.
@@ -856,7 +861,7 @@ class ILoop(config: ShellConfig, inOverride: BufferedReader = null,
     result
   }
 
-  private val continueText   = {
+  private val continueText = {
     val text   = enversion(continueString)
     val margin = promptText.linesIterator.toList.last.length - text.length
     if (margin > 0) " " * margin + text else text

diff --git a/src/repl-frontend/scala/tools/nsc/interpreter/shell/Reporter.scala b/src/repl-frontend/scala/tools/nsc/interpreter/shell/Reporter.scala
@@ -43,8 +43,16 @@ class ReplReporterImpl(val config: ShellConfig, val settings: Settings = new Set
     flush()
   }
 
+  private def indentDepth: Int = config.promptText.linesIterator.toList.last.length
+  private[this] var indentation: String = " " * indentDepth
+  def indenting(n: Int)(body: => Unit): Unit = {
+    val save = indentation
+    indentation = " " * n
+    try body finally indentation = save
+  }
+  private def indented(str: String) = str.linesIterator.mkString(indentation, "\n" + indentation, "")
+
   def colorOk: Boolean = config.colorOk
-  def indentDepth: Int = config.promptText.linesIterator.toList.last.length
   def isDebug: Boolean = config.isReplDebug
   def isTrace: Boolean = config.isReplTrace
 
@@ -152,9 +160,6 @@ class ReplReporterImpl(val config: ShellConfig, val settings: Settings = new Set
     printMessage(pos, prefix + msg)
   }
 
-  private val indentation = " " * indentDepth
-  private def indented(str: String) = str.linesIterator.mkString(indentation, "\n" + indentation, "")
-
   // indent errors, error message uses the caret to point at the line already on the screen instead of repeating it
   // TODO: can we splice the error into the code the user typed when multiple lines were entered?
   // (should also comment out the error to keep multi-line copy/pastable)

diff --git a/src/repl/scala/tools/nsc/interpreter/Interface.scala b/src/repl/scala/tools/nsc/interpreter/Interface.scala
@@ -238,6 +238,9 @@ trait ReplReporter extends Reporter {
     */
   def withoutUnwrapping(body: => Unit): Unit
 
+  /** Change indentation due to prompt. */
+  def indenting(n: Int)(body: => Unit): Unit
+
 
   /** Print result (Right --> success, Left --> error)
     */

diff --git a/test/files/run/repl-replay.check b/test/files/run/repl-replay.check
@@ -0,0 +1,12 @@
+
+scala> locally { val x = 42 ; "$x" }
+res0: String = $x
+
+scala> :replay -Xlint
+replay> locally { val x = 42 ; "$x" }
+                               ^
+        warning: possible missing interpolator: detected interpolated identifier `$x`
+res0: String = $x
+
+
+scala> :quit
diff --git a/test/files/run/repl-replay.scala b/test/files/run/repl-replay.scala
@@ -0,0 +1,9 @@
+
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  override def code = """
+    |locally { val x = 42 ; "$x" }
+    |:replay -Xlint
+  """.stripMargin.trim
+}