luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2271 from Duhemm/fix-2228 

Report failed compilation if errors are registered.
This commit is contained in:
eugene yokota 2015-11-12 02:14:08 -05:00
parent be9f1cdf95 e19ca7bf85
commit 222623071a
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compile/src/main/scala/sbt/compiler/javac/DiagnosticsReporter.scala
View File

@ -14,6 +14,10 @@ import javax.tools.Diagnostic.NOPOS
final class DiagnosticsReporter(reporter: Reporter) extends DiagnosticListener[JavaFileObject] { final class DiagnosticsReporter(reporter: Reporter) extends DiagnosticListener[JavaFileObject] {
val END_OF_LINE_MATCHER = "(\r\n)|[\r]|[\n]" val END_OF_LINE_MATCHER = "(\r\n)|[\r]|[\n]"
val EOL = System.getProperty("line.separator") val EOL = System.getProperty("line.separator")
private[this] var errorEncountered = false
def hasErrors: Boolean = errorEncountered
private def fixedDiagnosticMessage(d: Diagnostic[_ <: JavaFileObject]): String = { private def fixedDiagnosticMessage(d: Diagnostic[_ <: JavaFileObject]): String = {
def getRawMessage = d.getMessage(null) def getRawMessage = d.getMessage(null)
def fixWarnOrErrorMessage = { def fixWarnOrErrorMessage = {
@ -110,6 +114,7 @@ final class DiagnosticsReporter(reporter: Reporter) extends DiagnosticListener[J
if (sourceUri.isDefined) s"${sourceUri.get}:${if (line.isDefined) line.get else -1}" if (sourceUri.isDefined) s"${sourceUri.get}:${if (line.isDefined) line.get else -1}"
else "" else ""
} }
if (severity == Severity.Error) errorEncountered = true
reporter.log(pos, msg, severity) reporter.log(pos, msg, severity)
} }
} }

6
compile/src/main/scala/sbt/compiler/javac/LocalJava.scala
View File

@ -66,6 +66,10 @@ final class LocalJavaCompiler(compiler: javax.tools.JavaCompiler) extends JavaCo
val diagnostics = new DiagnosticsReporter(reporter) val diagnostics = new DiagnosticsReporter(reporter)
val fileManager = compiler.getStandardFileManager(diagnostics, null, null) val fileManager = compiler.getStandardFileManager(diagnostics, null, null)
val jfiles = fileManager.getJavaFileObjectsFromFiles(sources.asJava) val jfiles = fileManager.getJavaFileObjectsFromFiles(sources.asJava)
compiler.getTask(logWriter, fileManager, diagnostics, options.asJava, null, jfiles).call() val success = compiler.getTask(logWriter, fileManager, diagnostics, options.asJava, null, jfiles).call()
// The local compiler may report a successful compilation even though there are errors (e.g. encoding problems in the
// source files). In a similar situation, command line javac reports a failed compilation. To have the local java compiler
// stick to javac's behavior, we report a failed compilation if there have been errors.
success && !diagnostics.hasErrors
} }
} }

12
notes/0.13.10/local-java-report-errors.md Normal file
View File

@ -0,0 +1,12 @@
[@Duhemm]: http://github.com/Duhemm
[2228]: https://github.com/sbt/sbt/issues/2228
[2271]: https://github.com/sbt/sbt/pull/2271
### Fixes with compatibility implications
### Improvements
### Bug fixes
- Report java compilation as failed if the local java compiler reported compilation errors (issue [#2228][2228]) [#2271][2271] by [@Duhemm][@Duhemm]