Make new REPL work with sbt bridge

Author: felixmulder

project/Build.scala

@@ -517,6 +517,13 @@ object Build {
                                   "com.novocode" % "junit-interface" % "0.11" % "test",
                                   "org.scala-lang" % "scala-library" % scalacVersion % "test"),
 
+      // Repl subproject shouldn't be distributed on its own yet, so the
+      // sources need to be included in the dotty compiler to be available to
+      // the sbt bridge
+      unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "repl" / "src",
+      unmanagedSourceDirectories in Test += baseDirectory.value / ".." / "repl" / "test",
+      unmanagedResourceDirectories in Test += baseDirectory.value / ".." / "repl" / "test-resources",
+
       // enable improved incremental compilation algorithm
       incOptions := incOptions.value.withNameHashing(true),
 

repl/src/dotty/tools/repl/Rendering.scala

@@ -20,9 +20,8 @@ import dotc.core.StdNames.str
  *       `ReplDriver#resetToInitial` is called, the accompanying instance of
  *       `Rendering` is no longer valid.
  */
-private[repl] class Rendering(compiler: ReplCompiler) {
-
-  private var currentClassLoader: Option[ClassLoader] = None
+private[repl] class Rendering(compiler: ReplCompiler,
+                              private var currentClassLoader: Option[ClassLoader] = None) {
 
   private def classLoader()(implicit ctx: Context) =
     currentClassLoader.getOrElse {

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

@@ -77,7 +77,9 @@ case class Completions(cursor: Int,
                        details: List[String])
 
 /** Main REPL instance, orchestrating input, compilation and presentation */
-class ReplDriver(settings: Array[String], protected val out: PrintStream = System.out) extends Driver {
+class ReplDriver(settings: Array[String],
+                 protected val out: PrintStream = System.out,
+                 protected val classLoader: Option[ClassLoader] = None) extends Driver {
 
   /** Overridden to `false` in order to not have to give sources on the
    *  commandline
@@ -110,7 +112,7 @@ class ReplDriver(settings: Array[String], protected val out: PrintStream = Syste
         new PlainDirectory(new Directory(new JFile(rootCtx.settings.d.value(rootCtx))))
     }
     compiler = new ReplCompiler(outDir)
-    rendering = new Rendering(compiler)
+    rendering = new Rendering(compiler, classLoader)
   }
 
   protected[this] var rootCtx: Context = _
@@ -197,9 +199,9 @@ class ReplDriver(settings: Array[String], protected val out: PrintStream = Syste
 
   /** Compile `parsed` trees and evolve `state` in accordance */
   protected[this] final def compile(parsed: Parsed)(implicit state: State): State = {
-    import dotc.ast.Trees._
-    import dotc.ast.untpd._
-    def extractNewestWrapper(tree: untpd.Tree): Name = tree match {
+    import dotc.ast.Trees.PackageDef
+    import untpd.{ PackageDef => _, _ }
+    def extractNewestWrapper(tree: Tree): Name = tree match {
       case PackageDef(_, (obj: ModuleDef) :: Nil) => obj.name.moduleClassName
       case _ => nme.NO_NAME
     }

repl/src/dotty/tools/repl/terminal/filters/ReadlineFilters.scala

@@ -161,7 +161,7 @@ object ReadlineFilters {
         allAfterCursor.splitAt(
           nextNewlineIndex
         ) match {
-          case (Vector(), Vector('\n', allAfterNewline@ _*)) =>
+          case (Vector(), ('\n' +: allAfterNewline)) =>
             // if there's only a newline after cursor on line, cut it
             append(Vector('\n'))
             (allBeforeCursor ++ allAfterNewline, c)

sbt-bridge/src/xsbt/ConsoleInterface.scala

@@ -6,9 +6,7 @@ package xsbt
 import xsbti.Logger
 
 import dotty.tools.dotc.core.Contexts.Context
-// TODO: decide what to do with sbt REPL interface
-// import dotty.tools.dotc.repl.REPL
-// import dotty.tools.dotc.repl.REPL.Config
+import dotty.tools.repl.ReplDriver
 
 class ConsoleInterface {
   def commandArguments(
@@ -28,43 +26,13 @@ class ConsoleInterface {
           bindValues: Array[Any],
           log: Logger
   ): Unit = {
-    //val completeArgs =
-    //  args                                    :+
-    //  "-bootclasspath" :+ bootClasspathString :+
-    //  "-classpath"     :+ classpathString
-
-    //println("Starting dotty interpreter...")
-    //val repl = ConsoleInterface.customRepl(
-    //  initialCommands :: Nil,
-    //  cleanupCommands :: Nil,
-    //  bindNames zip bindValues,
-    //  loader
-    //)
-    //repl.process(completeArgs)
+    val completeArgs =
+      args ++ {
+        if (bootClasspathString.isEmpty) Array.empty[String]
+        else Array("-bootclasspath", bootClasspathString)
+      } ++
+      Array("-classpath", classpathString)
+
+    new ReplDriver(completeArgs, classLoader = Some(loader)).runUntilQuit()
   }
 }
-
-object ConsoleInterface {
-  //def customConfig(
-  //  initCmds: List[String],
-  //  cleanupCmds: List[String],
-  //  boundVals: Array[(String, Any)],
-  //  loader: ClassLoader
-  //) = new Config {
-  //  override val initialCommands: List[String] = initCmds
-  //  override val cleanupCommands: List[String] = cleanupCmds
-  //  override val boundValues: Array[(String, Any)] = boundVals
-  //  override val classLoader: Option[ClassLoader] = Option(loader)
-  //}
-
-  //def customRepl(cfg: Config): REPL = new REPL {
-  //  override lazy val config = cfg
-  //}
-
-  //def customRepl(
-  //  initCmds: List[String],
-  //  cleanupCmds: List[String],
-  //  boundVals: Array[(String, Any)],
-  //  loader: ClassLoader
-  //): REPL = customRepl(customConfig(initCmds, cleanupCmds, boundVals, loader))
-}