Added new tests

Author: SzymonPajzert

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

@@ -26,6 +26,8 @@ import org.jline.reader._
 
 import scala.annotation.tailrec
 import scala.collection.JavaConverters._
+import scala.runtime.ZippedTraversable2
+
 
 /** The state of the REPL contains necessary bindings instead of having to have
  *  mutation
@@ -95,13 +97,15 @@ class ReplDriver(settings: Array[String],
   // is called, we're in business
   resetToInitial()
 
+  final def runUntilQuit(): State = runUntilQuit(initState)
+
   /** 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(): State = {
+  final def runUntilQuit(initialState: State): State = {
     val terminal = new JLineTerminal()
 
     /** Blockingly read a line, getting back a parse result */
@@ -127,7 +131,7 @@ class ReplDriver(settings: Array[String],
       else loop(interpret(res)(state))
     }
 
-    try withRedirectedOutput { loop(initState) }
+    try withRedirectedOutput { loop(initialState) }
     finally terminal.close()
   }
 
@@ -136,8 +140,14 @@ class ReplDriver(settings: Array[String],
     interpret(parsed)
   }
 
+  final def bindValues(bindPairs: ZippedTraversable2[String, Any]): State = {
+    bindPairs.foldLeft(initState) {
+      case (state, (name, value)) => bind(name, value)(state)
+    }
+  }
+
   // TODO: i3007
-  final def bind(name:String, value:Any)(implicit state: State): State = state
+  private def bind(name:String, value:Any)(implicit state: State): State = state
 
   private def withRedirectedOutput(op: => State): State =
     Console.withOut(out) { Console.withErr(out) { op } }

sbt-bridge/src/xsbt/ConsoleInterface.scala

@@ -34,13 +34,11 @@ class ConsoleInterface {
       Array("-classpath", classpathString)
 
     val driver = new ReplDriver(completeArgs, classLoader = Some(loader))
-    val initState = driver.initState
-    val s0 = (bindNames, bindValues).zipped.folLeft(initState) {
-      case (state, (name, value)) => driver.bind(name, value)(state)
-    }
+
+    val s0 = driver.bindValues((bindNames, bindValues).zipped)
     val s1 = driver.run(initialCommands)(s0)
-    // handle failure during initialisation
+    // TODO handle failure during initialisation
     val s2 = driver.runUntilQuit(s1)
-    driver.run(s1)
+    driver.run(cleanupCommands)(s2)
   }
 }

sbt-dotty/sbt-test/sbt-dotty/example-project/test

@@ -1,4 +1,4 @@
 > run
 > 'set initialCommands := "1 + 1" '
 # FIXME: does not work on the CI
-#> console
+> console