Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129

1 files changed, 11 insertions, 9 deletions

diff --git a/src/scaladoc/scala/tools/nsc/ScalaDoc.scala b/src/scaladoc/scala/tools/nsc/ScalaDoc.scala
index 52a0c20a11..32a6ba0ce3 100644
--- a/src/scaladoc/scala/tools/nsc/ScalaDoc.scala
+++ b/src/scaladoc/scala/tools/nsc/ScalaDoc.scala
@@ -18,14 +18,10 @@ class ScalaDoc {
   val versionMsg = "Scaladoc %s -- %s".format(Properties.versionString, Properties.copyrightString)
 
   def process(args: Array[String]): Boolean = {
-    var reporter: ConsoleReporter = null
+    var reporter: ScalaDocReporter = null
     val docSettings = new doc.Settings(msg => reporter.error(FakePos("scaladoc"), msg + "\n  scaladoc -help  gives more information"),
                                        msg => reporter.printMessage(msg))
-    reporter = new ConsoleReporter(docSettings) {
-      // need to do this so that the Global instance doesn't trash all the
-      // symbols just because there was an error
-      override def hasErrors = false
-    }
+    reporter = new ScalaDocReporter(docSettings)
     val command = new ScalaDoc.Command(args.toList, docSettings)
     def hasFiles = command.files.nonEmpty || docSettings.uncompilableFiles.nonEmpty
 
@@ -50,12 +46,18 @@ class ScalaDoc {
     }
     finally reporter.printSummary()
 
-    // not much point in returning !reporter.hasErrors when it has
-    // been overridden with constant false.
-    true
+    !reporter.reallyHasErrors
   }
 }
 
+class ScalaDocReporter(settings: Settings) extends ConsoleReporter(settings) {
+
+  // need to do sometimes lie so that the Global instance doesn't
+  // trash all the symbols just because there was an error
+  override def hasErrors = false
+  def reallyHasErrors = super.hasErrors
+}
+
 object ScalaDoc extends ScalaDoc {
   class Command(arguments: List[String], settings: doc.Settings) extends CompilerCommand(arguments, settings) {
     override def cmdName = "scaladoc"