review comments

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 =

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
   }
 

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