Use the index in the repl state for the line module

Author: nicolasstucki

compiler/src/dotty/tools/repl/ParseResult.scala

@@ -115,10 +115,8 @@ object ParseResult {
     stats
   }
 
-  private[this] var replSessionNumber = 0
-
   /** Extract a `ParseResult` from the string `sourceCode` */
-  def apply(sourceCode: String)(implicit ctx: Context): ParseResult =
+  def apply(sourceCode: String)(implicit state: State): ParseResult =
     sourceCode match {
       case "" => Newline
       case CommandExtract(cmd, arg) => cmd match {
@@ -132,11 +130,12 @@ object ParseResult {
         case _ => UnknownCommand(cmd)
       }
       case _ =>
-        replSessionNumber += 1
-        val source = SourceFile.virtual(str.REPL_SESSION_LINE + replSessionNumber, sourceCode)
+        implicit val ctx: Context = state.context
+
+        val source = SourceFile.virtual(str.REPL_SESSION_LINE + (state.objectIndex + 1), sourceCode)
 
         val reporter = newStoreReporter
-        val stats = parseStats(sourceCode)(ctx.fresh.setReporter(reporter).withSource(source))
+        val stats = parseStats(sourceCode)(state.context.fresh.setReporter(reporter).withSource(source))
 
         if (reporter.hasErrors)
           SyntaxErrors(

compiler/src/dotty/tools/repl/ReplCompiler.scala

@@ -140,6 +140,7 @@ class ReplCompiler extends Compiler {
   private def createUnit(defs: Definitions)(implicit ctx: Context): CompilationUnit = {
     val objectName = ctx.source.file.toString
     assert(objectName.startsWith(str.REPL_SESSION_LINE))
+    assert(objectName.endsWith(defs.state.objectIndex.toString))
     val objectTermName = ctx.source.file.toString.toTermName
     objectNames.update(defs.state.objectIndex, objectTermName)
 
@@ -236,7 +237,7 @@ class ReplCompiler extends Compiler {
         PackageDef(Ident(nme.EMPTY_PACKAGE), List(wrapper))
       }
 
-      ParseResult(expr) match {
+      ParseResult(expr)(state) match {
         case Parsed(_, trees) =>
           wrap(trees).result
         case SyntaxErrors(_, reported, trees) =>

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -113,7 +113,7 @@ class ReplDriver(settings: Array[String],
       implicit val ctx = state.context
       try {
         val line = terminal.readLine(completer)
-        ParseResult(line)
+        ParseResult(line)(state)
       } catch {
         case _: EndOfFileException |
             _: UserInterruptException => // Ctrl+D or Ctrl+C
@@ -132,7 +132,7 @@ class ReplDriver(settings: Array[String],
   }
 
   final def run(input: String)(implicit state: State): State = withRedirectedOutput {
-    val parsed = ParseResult(input)(state.context)
+    val parsed = ParseResult(input)(state)
     interpret(parsed)
   }