From c73f513016a8c2be94decfda8ea83b6e1b95601d Mon Sep 17 00:00:00 2001 From: fkorotkov Date: Thu, 16 Jul 2015 15:49:06 -0400 Subject: [PATCH] review comments --- .../main/scala/sbt/compiler/javac/DiagnosticsReporter.scala | 3 +-- .../src/test/scala/sbt/compiler/javac/JavaCompilerSpec.scala | 2 +- .../proper-line-content-from-local-javac.markdown | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) rename notes/{0.13.9 => 0.13.10}/proper-line-content-from-local-javac.markdown (79%) diff --git a/compile/src/main/scala/sbt/compiler/javac/DiagnosticsReporter.scala b/compile/src/main/scala/sbt/compiler/javac/DiagnosticsReporter.scala index d7abef74c..702460885 100644 --- a/compile/src/main/scala/sbt/compiler/javac/DiagnosticsReporter.scala +++ b/compile/src/main/scala/sbt/compiler/javac/DiagnosticsReporter.scala @@ -84,8 +84,7 @@ final class DiagnosticsReporter(reporter: Reporter) extends DiagnosticListener[J case _ => None } } catch { - case ignored: NoSuchMethodException => None - case ignored: NoSuchFieldException => None + case ignored: ReflectiveOperationException => None } def getExpression: String = diff --git a/compile/src/test/scala/sbt/compiler/javac/JavaCompilerSpec.scala b/compile/src/test/scala/sbt/compiler/javac/JavaCompilerSpec.scala index a2bd1141c..93ad96382 100644 --- a/compile/src/test/scala/sbt/compiler/javac/JavaCompilerSpec.scala +++ b/compile/src/test/scala/sbt/compiler/javac/JavaCompilerSpec.scala @@ -114,7 +114,7 @@ object JavaCompilerSpec extends Specification { case Some(content) => content.equalsIgnoreCase(p.position.lineContent()) case _ => true } - def lineNumberCheck = p.position.line.isDefined && (p.position.line.get == lineno) + def lineNumberCheck = p.position.line.exists(_ == lineno) lineNumberCheck && lineContentCheck } diff --git a/notes/0.13.9/proper-line-content-from-local-javac.markdown b/notes/0.13.10/proper-line-content-from-local-javac.markdown similarity index 79% rename from notes/0.13.9/proper-line-content-from-local-javac.markdown rename to notes/0.13.10/proper-line-content-from-local-javac.markdown index 2a92fd262..5203e28c6 100644 --- a/notes/0.13.9/proper-line-content-from-local-javac.markdown +++ b/notes/0.13.10/proper-line-content-from-local-javac.markdown @@ -1,5 +1,6 @@ [@fkorotkov]: http://github.com/fkorotkov + [#2108]: https://github.com/sbt/sbt/pull/2108 ### Fixes with compatibility implications