Fix failing tests and compilation errors.

scalacenter · Aug 16, 2017 · c3605c3 · c3605c3
1 parent 8810e25
commit c3605c3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/readme/Configuration.scalatex b/readme/Configuration.scalatex
@@ -26,7 +26,7 @@
         If a rewrites is on the classpath, you can classload it with the
         @code{scala:} protocol.
         @config
-          rewrite = "scala:scalafix.rewrite.ProcedureSyntax"
+          rewrite = "scala:scalafix.internal.rewrite.ProcedureSyntax"
 
       @sect{github:}
         If a rewrite is written in a single file and you want a short syntax,

diff --git a/readme/Rewrites.scalatex b/readme/Rewrites.scalatex
@@ -1,6 +1,7 @@
 @import Main._
 @import scalafix.Readme._
 @import scalafix.rewrite._
+@import scalafix.internal.rewrite._
 
 @sect{Rewrites}
   @p

diff --git a/scalafix-cli/src/main/scala/scalafix/cli/CliRunner.scala b/scalafix-cli/src/main/scala/scalafix/cli/CliRunner.scala
@@ -81,7 +81,8 @@ sealed abstract case class CliRunner(
     }
     display.stop()
     val exit = exitCode.get()
-    if (!config.reporter.hasErrors) ExitStatus.merge(ExitStatus.LinterError, exit)
+    if (!config.reporter.hasErrors)
+      ExitStatus.merge(ExitStatus.LinterError, exit)
     else exit
   }
 

diff --git a/scalafix-cli/src/test/scala/scalafix/cli/CliTest.scala b/scalafix-cli/src/test/scala/scalafix/cli/CliTest.scala
@@ -13,7 +13,6 @@ import scalafix.internal.cli.ScalafixOptions
 import scalafix.internal.rewrite.ExplicitReturnTypes
 import scalafix.internal.rewrite.ProcedureSyntax
 import scalafix.internal.util.FileOps
-import scalafix.rewrite.ProcedureSyntax
 import scalafix.testkit.DiffAssertions
 import org.scalatest.FunSuite
 

diff --git a/scalafix-core/shared/src/main/scala/scalafix/internal/config/PrintStreamReporter.scala b/scalafix-core/shared/src/main/scala/scalafix/internal/config/PrintStreamReporter.scala
@@ -3,6 +3,7 @@ package scalafix.internal.config
 import scala.meta.Position
 import scala.meta.internal.inputs.XtensionPositionFormatMessage
 import java.io.PrintStream
+import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
 import scalafix.internal.util.Severity
 import metaconfig._
@@ -29,17 +30,19 @@ case class PrintStreamReporter(
           )
       }
     }
-  private val _hasError = new AtomicReference(false)
+  private val _errorCount = new AtomicInteger()
 
   override def report(message: String, position: Position, severity: Severity)(
       implicit ctx: LogContext): Unit = {
-    _hasError.compareAndSet(false, severity == Severity.Error)
+    if (severity == Severity.Error) {
+      _errorCount.incrementAndGet()
+    }
     val enclosing =
       if (includeLoggerName) s"(${ctx.enclosing.value}) " else ""
     outStream.println(
       position.formatMessage(enclosing + severity.toString, message))
   }
 
   /** Returns true if this reporter has seen an error */
-  override def hasErrors: Boolean = _hasError.get()
+  override def errorCount: Int = _errorCount.get()
 }
diff --git a/scalafix-core/shared/src/main/scala/scalafix/internal/config/ScalafixReporter.scala b/scalafix-core/shared/src/main/scala/scalafix/internal/config/ScalafixReporter.scala
@@ -7,7 +7,10 @@ import metaconfig.ConfDecoder
 trait ScalafixReporter {
 
   /** Returns true if this reporter has seen an error */
-  def hasErrors: Boolean
+  def hasErrors: Boolean = errorCount > 0
+
+  /** Returns the number of reported errors */
+  def errorCount: Int
 
   /** Messages with severity < minSeverity are skipped. */
   def minSeverity: Severity