sbt.internal.inc.Position: add startOffset and endOffset

Author: smarter

internal/compiler-bridge/src/main/scala/xsbt/DelegatingReporter.scala

@@ -10,7 +10,7 @@ package xsbt
 import java.io.File
 import java.util.Optional
 
-import scala.reflect.internal.util.{ FakePos, NoPosition, Position }
+import scala.reflect.internal.util.{ FakePos, NoPosition, Position, RangePosition }
 // Left for compatibility
 import Compat._
 
@@ -24,7 +24,9 @@ private object DelegatingReporter {
                      lineContent0: String,
                      offset0: Option[Int],
                      pointer0: Option[Int],
-                     pointerSpace0: Option[String])
+                     pointerSpace0: Option[String],
+                     startOffset0: Option[Int],
+                     endOffset0: Option[Int])
       extends xsbti.Position {
     val line = o2oi(line0)
     val lineContent = lineContent0
@@ -33,6 +35,8 @@ private object DelegatingReporter {
     val sourceFile = o2jo(sourceFile0)
     val pointer = o2oi(pointer0)
     val pointerSpace = o2jo(pointerSpace0)
+    override val startOffset = o2oi(startOffset0)
+    override val endOffset = o2oi(endOffset0)
     override def toString =
       (sourcePath0, line0) match {
         case (Some(s), Some(l)) => s + ":" + l
@@ -42,7 +46,7 @@ private object DelegatingReporter {
   }
 
   object PositionImpl {
-    def empty: PositionImpl = new PositionImpl(None, None, None, "", None, None, None)
+    def empty: PositionImpl = new PositionImpl(None, None, None, "", None, None, None, None, None)
   }
 
   import java.lang.{ Integer => I }
@@ -81,13 +85,18 @@ private object DelegatingReporter {
         case '\t' => '\t'
         case _    => ' '
       }
+      val isRange = pos.isInstanceOf[RangePosition]
+      val startOffset = if (isRange) Some(pos.start) else None
+      val endOffset = if (isRange) Some(pos.end) else None
       new PositionImpl(Option(sourcePath),
                        Option(sourceFile),
                        Option(line),
                        lineContent,
                        Option(offset),
                        Option(pointer),
-                       Option(pointerSpace.mkString))
+                       Option(pointerSpace.mkString),
+                       startOffset,
+                       endOffset)
     }
 
     cleanPos(dirtyPos) match {

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/javac/DiagnosticsReporter.scala

@@ -15,7 +15,7 @@ import java.util.Optional
 import java.io.File
 import javax.tools.{ Diagnostic, JavaFileObject, DiagnosticListener }
 import sbt.io.IO
-import sbt.util.InterfaceUtil.o2jo
+import sbt.util.InterfaceUtil.{ o2jo, jo2o }
 import xsbti.{ Severity, Reporter }
 import javax.tools.Diagnostic.NOPOS
 
@@ -59,8 +59,8 @@ object DiagnosticsReporter {
       override val line: Optional[Integer],
       override val lineContent: String,
       override val offset: Optional[Integer],
-      val startPosition: Option[Long],
-      val endPosition: Option[Long]
+      override val startOffset: Optional[Integer],
+      override val endOffset: Optional[Integer]
   ) extends xsbti.Position {
     override val sourcePath: Optional[String] = o2jo(sourceUri)
     override val sourceFile: Optional[File] = o2jo(sourceUri.map(new File(_)))
@@ -98,8 +98,8 @@ object DiagnosticsReporter {
       val sourcePath: Option[String] = source map (obj => IO.toFile(obj.toUri).getAbsolutePath)
       val line: Optional[Integer] = o2jo(checkNoPos(d.getLineNumber) map (_.toInt))
       val offset: Optional[Integer] = o2jo(checkNoPos(d.getPosition) map (_.toInt))
-      val startPosition: Option[Long] = checkNoPos(d.getStartPosition)
-      val endPosition: Option[Long] = checkNoPos(d.getEndPosition)
+      val startOffset: Optional[Integer] = o2jo(checkNoPos(d.getStartPosition) map (_.toInt))
+      val endOffset: Optional[Integer] = o2jo(checkNoPos(d.getEndPosition) map (_.toInt))
 
       def lineContent: String = {
         def getDiagnosticLine: Option[String] =
@@ -127,17 +127,17 @@ object DiagnosticsReporter {
           source match {
             case None => ""
             case Some(source) =>
-              (Option(source.getCharContent(true)), startPosition, endPosition) match {
+              (Option(source.getCharContent(true)), jo2o(startOffset), jo2o(endOffset)) match {
                 case (Some(cc), Some(start), Some(end)) =>
-                  cc.subSequence(start.toInt, end.toInt).toString
+                  cc.subSequence(start, end).toString
                 case _ => ""
               }
           }
 
         getDiagnosticLine.getOrElse(getExpression)
       }
 
-      new PositionImpl(sourcePath, line, lineContent, offset, startPosition, endPosition)
+      new PositionImpl(sourcePath, line, lineContent, offset, startOffset, endOffset)
     }
 
   }

internal/zinc-persist/src/main/protobuf/schema.proto

@@ -66,6 +66,8 @@ message Position {
     string pointerSpace = 5;
     string sourcePath = 6;
     string sourceFilepath = 7;
+    sint32 startOffset = 8;
+    sint32 endOffset = 9;
 }
 
 message Problem {

internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufReaders.scala

@@ -127,7 +127,9 @@ final class ProtobufReaders(mapper: ReadMapper) {
       pointer0 = fromInt(position.pointer),
       pointerSpace0 = fromString(position.pointerSpace),
       sourcePath0 = fromString(position.sourcePath),
-      sourceFile0 = fromString(position.sourceFilepath).map(fromPathString)
+      sourceFile0 = fromString(position.sourceFilepath).map(fromPathString),
+      startOffset0 = fromInt(position.startOffset),
+      endOffset0 = fromInt(position.endOffset),
     )
   }
 

internal/zinc-persist/src/main/scala/sbt/internal/inc/binary/converters/ProtobufWriters.scala

@@ -130,7 +130,9 @@ final class ProtobufWriters(mapper: WriteMapper) {
       pointer = position.pointer.toOption.fold(MissingInt)(_.toInt),
       pointerSpace = position.pointerSpace.toOption.getOrElse(MissingString),
       sourcePath = position.sourcePath.toOption.getOrElse(MissingString),
-      sourceFilepath = position.sourceFile.toOption.fold(MissingString)(toStringPath)
+      sourceFilepath = position.sourceFile.toOption.fold(MissingString)(toStringPath),
+      startOffset = position.startOffset.toOption.fold(MissingInt)(_.toInt),
+      endOffset = position.endOffset.toOption.fold(MissingInt)(_.toInt),
     )
   }