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

Merge pull request #2201 from fkorotkov/javac-line-content-fixes 

Use getPosition method to get an offset position instead of using a line number
This commit is contained in:
eugene yokota 2015-09-10 22:33:52 -04:00
parent 57321bf6bc cf8d7fbdff
commit d4f7977c42
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,11 +76,12 @@ final class DiagnosticsReporter(reporter: Reporter) extends DiagnosticListener[J
val diagnostic = d.getClass.getField("d").get(d)
// See com.sun.tools.javac.util.JCDiagnostic#getDiagnosticSource
val getDiagnosticSourceMethod = diagnostic.getClass.getDeclaredMethod("getDiagnosticSource")
Option(getDiagnosticSourceMethod.invoke(diagnostic)) match {
case Some(diagnosticSource) =>
val getPositionMethod = diagnostic.getClass.getDeclaredMethod("getPosition")
(Option(getDiagnosticSourceMethod.invoke(diagnostic)), Option(getPositionMethod.invoke(diagnostic))) match {
case (Some(diagnosticSource), Some(position: java.lang.Long)) =>
// See com.sun.tools.javac.util.DiagnosticSource
val getLineMethod = diagnosticSource.getClass.getMethod("getLine", Integer.TYPE)
Option(getLineMethod.invoke(diagnosticSource, line.get())).map(_.toString)
Option(getLineMethod.invoke(diagnosticSource, new Integer(position.intValue()))).map(_.toString)
case _ => None
}
} catch {