Took into account code review comments

Author: SzymonPajzert

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

@@ -72,7 +72,7 @@ class ReplDriver(settings: Array[String],
   }
 
   /** the initial, empty state of the REPL session */
-  protected[this] def initState = State(0, 0, Nil, rootCtx)
+  final def initialState = State(0, 0, Nil, rootCtx)
 
   /** Reset state of repl to the initial state
    *
@@ -97,15 +97,15 @@ class ReplDriver(settings: Array[String],
   // is called, we're in business
   resetToInitial()
 
-  final def runUntilQuit(): State = runUntilQuit(initState)
+  final def runUntilQuit(): State = runUntilQuit(initialState)
 
   /** Run REPL with `state` until `:quit` command found
    *
    *  This method is the main entry point into the REPL. Its effects are not
    *  observable outside of the CLI, for this reason, most helper methods are
    *  `protected final` to facilitate testing.
    */
-  final def runUntilQuit(initialState: State): State = {
+  final def runUntilQuit(initialState: State = initialState): State = {
     val terminal = new JLineTerminal()
 
     /** Blockingly read a line, getting back a parse result */
@@ -139,15 +139,9 @@ class ReplDriver(settings: Array[String],
     val parsed = ParseResult(input)(state.context)
     interpret(parsed)
   }
-  
-  final def bindValues(bindPairs: ZippedTraversable2[String, Any]): State = {
-    bindPairs.foldLeft(initState) {
-      case (state, (name, value)) => bind(name, value)(state)
-    }
-  }
 
   // TODO: i3007
-  private def bind(name:String, value:Any)(implicit state: State): State = state
+  final def bind(name:String, value:Any)(implicit state: State): State = state
 
   private def withRedirectedOutput(op: => State): State =
     Console.withOut(out) { Console.withErr(out) { op } }
@@ -321,7 +315,7 @@ class ReplDriver(settings: Array[String],
 
     case Reset =>
       resetToInitial()
-      initState
+      initialState
 
     case Imports =>
       state.imports.foreach(i => out.println(SyntaxHighlighting(i.show(state.context))))

compiler/test/dotty/tools/repl/ReplTest.scala

@@ -32,7 +32,7 @@ class ReplTest private (out: ByteArrayOutputStream) extends ReplDriver(
     storedOutput()
 
   def fromInitialState[A](op: State => A): A =
-    op(initState)
+    op(initialState)
 
   implicit class TestingState(state: State) {
     def andThen[A](op: State => A): A = op(state)

compiler/test/dotty/tools/repl/ScriptedTests.scala

@@ -65,7 +65,7 @@ class ScriptedTests extends ReplTest with MessageRendering {
       resetToInitial()
       val inputRes = extractInputs(prompt)
       val buf = new ArrayBuffer[String]
-      inputRes.foldLeft(initState) { (state, input) =>
+      inputRes.foldLeft(initialState) { (state, input) =>
         val (out, nstate) = evaluate(state, input, prompt)
         buf.append(out)
         nstate

sbt-bridge/src/xsbt/ConsoleInterface.scala

@@ -35,7 +35,10 @@ class ConsoleInterface {
 
     val driver = new ReplDriver(completeArgs, classLoader = Some(loader))
 
-    val s0 = driver.bindValues((bindNames, bindValues).zipped)
+    val s0 = (bindNames, bindValues).zipped.foldLeft(driver.initialState) {
+      case (state, (name, value)) => driver.bind(name, value)(state)
+    }
+
     val s1 = driver.run(initialCommands)(s0)
     // TODO handle failure during initialisation
     val s2 = driver.runUntilQuit(s1)