Merge pull request scala#5655 from som-snytt/issue/10102

SI-10102 REPL ignores sbt init errors

Author: retronym

src/repl/scala/tools/nsc/InterpreterLoop.scala

@@ -3,10 +3,15 @@ package scala.tools.nsc
 import interpreter._
 import java.io._
 
-/** A compatibility stub.
+/** A compatibility stub for sbt.
  */
-@deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0")
+@deprecated("Use scala.tools.nsc.interpreter.ILoop.", "2.9.0")
 class InterpreterLoop(in0: Option[BufferedReader], out: PrintWriter) extends ILoop(in0, out) {
   def this(in0: BufferedReader, out: PrintWriter) = this(Some(in0), out)
   def this() = this(None, new PrintWriter(scala.Console.out))
+
+  override protected final val isSbt = true
+
+  @deprecated("use `process` instead", "2.9.0")
+  def main(settings: Settings): Unit = process(settings) //used by sbt
 }

src/repl/scala/tools/nsc/interpreter/ILoop.scala

@@ -41,10 +41,7 @@ import Completion._
  *  @author  Lex Spoon
  *  @version 1.2
  */
-class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
-                extends AnyRef
-                   with LoopCommands
-{
+class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) extends LoopCommands {
   def this(in0: BufferedReader, out: JPrintWriter) = this(Some(in0), out)
   def this() = this(None, new JPrintWriter(Console.out, true))
 
@@ -57,6 +54,9 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
 
   private var globalFuture: Future[Boolean] = _
 
+  // ignore silent sbt errors on init
+  protected def isSbt: Boolean = false
+
   /** Print a welcome message! */
   def printWelcome(): Unit = {
     Option(replProps.welcome) filter (!_.isEmpty) foreach echo
@@ -1048,8 +1048,8 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
           //for (rs <- runnerSettings if rs.execute.isSetByUser) intp.printResults = false
         }
         intp.initializeSynchronous()
-        globalFuture = Future successful true
-        if (intp.reporter.hasErrors) {
+        globalFuture = Future.successful(true)
+        if (intp.reporter.hasErrors && (!isSbt || intp.reporter.hasReportableErrors)) {
           echo("Interpreter encountered errors during initialization!")
           null
         } else {
@@ -1076,9 +1076,6 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter)
         true
     }
   }
-
-  @deprecated("use `process` instead", "2.9.0")
-  def main(settings: Settings): Unit = process(settings) //used by sbt
 }
 
 object ILoop {

src/repl/scala/tools/nsc/interpreter/IMain.scala

@@ -131,7 +131,7 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     catch AbstractOrMissingHandler()
   }
   private val logScope = scala.sys.props contains "scala.repl.scope"
-  private def scopelog(msg: String) = if (logScope) Console.err.println(msg)
+  private def scopelog(msg: => String) = if (logScope) Console.err.println(msg)
 
   // argument is a thunk to execute after init is done
   def initialize(postInitSignal: => Unit) {
@@ -374,24 +374,25 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
     None
   }
 
-  private def updateReplScope(sym: Symbol, isDefined: Boolean) {
-    def log(what: String) {
+  private def updateReplScope(sym: Symbol, isDefined: Boolean): Unit = {
+    def log(what: String) = scopelog {
       val mark = if (sym.isType) "t " else "v "
       val name = exitingTyper(sym.nameString)
       val info = cleanTypeAfterTyper(sym)
       val defn = sym defStringSeenAs info
 
-      scopelog(f"[$mark$what%6s] $name%-25s $defn%s")
+      f"[$mark$what%6s] $name%-25s $defn%s"
     }
-    if (ObjectClass isSubClass sym.owner) return
-    // unlink previous
-    replScope lookupAll sym.name foreach { sym =>
-      log("unlink")
-      replScope unlink sym
+    if (!ObjectClass.isSubClass(sym.owner)) {
+      // unlink previous
+      replScope.lookupAll(sym.name) foreach { sym =>
+        log("unlink")
+        replScope unlink sym
+      }
+      val what = if (isDefined) "define" else "import"
+      log(what)
+      replScope enter sym
     }
-    val what = if (isDefined) "define" else "import"
-    log(what)
-    replScope enter sym
   }
 
   def recordRequest(req: Request) {

src/repl/scala/tools/nsc/interpreter/ReplReporter.scala

@@ -29,10 +29,24 @@ class ReplReporter(intp: IMain) extends ConsoleReporter(intp.settings, Console.i
     finally _truncationOK = saved
   }
 
+  private[this] var silentErrors = 0
   override def warning(pos: Position, msg: String): Unit = withoutTruncating(super.warning(pos, msg))
-  override def error(pos: Position, msg: String): Unit   = withoutTruncating(super.error(pos, msg))
+  override def error(pos: Position, msg: String): Unit   = {
+    val count0 = errorCount
+    withoutTruncating(super.error(pos, msg))
+    val count1 = errorCount
+    if (count1 > count0 && intp.totalSilence)
+      silentErrors += (count1 - count0)
+  }
+  private[interpreter] def reportableErrorCount = errorCount - silentErrors
+  private[interpreter] def hasReportableErrors  = reportableErrorCount > 0
+
+  override def reset(): Unit = {
+    silentErrors = 0
+    super.reset()
+  }
 
-  import scala.io.AnsiColor.{ RED, YELLOW, RESET }
+  import scala.io.AnsiColor.{RED, YELLOW, RESET}
 
   def severityColor(severity: Severity): String = severity match {
     case ERROR   => RED
@@ -50,7 +64,7 @@ class ReplReporter(intp: IMain) extends ConsoleReporter(intp.settings, Console.i
   }
 
   // shift indentation for source text entered at prompt
-  override def print(pos: Position, msg: String, severity: Severity) {
+  override def print(pos: Position, msg: String, severity: Severity): Unit = {
     val adjusted =
       if (pos.source.file.name == "<console>")
         new OffsetPosition(pos.source, pos.offset.getOrElse(0)) {
@@ -61,7 +75,7 @@ class ReplReporter(intp: IMain) extends ConsoleReporter(intp.settings, Console.i
     super.print(adjusted, msg, severity)
   }
 
-  override def printMessage(msg: String) {
+  override def printMessage(msg: String): Unit = {
     // Avoiding deadlock if the compiler starts logging before
     // the lazy val is complete.
     if (intp.isInitializeComplete) {
@@ -74,7 +88,7 @@ class ReplReporter(intp: IMain) extends ConsoleReporter(intp.settings, Console.i
     else Console.println("[init] " + msg)
   }
 
-  override def displayPrompt() = if (!intp.totalSilence) super.displayPrompt()
+  override def displayPrompt(): Unit = if (!intp.totalSilence) super.displayPrompt()
 
   override def rerunWithDetails(setting: reflect.internal.settings.MutableSettings#Setting, name: String) =
     s"; for details, enable `:setting $name' or `:replay $name'"