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

Merge pull request #7298 from adpi2/fix-7297

This commit is contained in:
eugene yokota 2023-06-14 08:56:06 -04:00 committed by GitHub
parent 448d92048f a209cf2700
commit c6bc422ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/internal/server/BuildServerReporter.scala
View File

@ -185,11 +185,15 @@ final class BuildServerReporterImpl(
val startColumnOpt = pos.startColumn.toOption.map(_.toLong)
val endLineOpt = pos.endLine.toOption.map(_.toLong - 1)
val endColumnOpt = pos.endColumn.toOption.map(_.toLong)
val lineOpt = pos.line.toOption.map(_.toLong - 1)
val columnOpt = pos.pointer.toOption.map(_.toLong)
def toPosition(lineOpt: Option[Long], columnOpt: Option[Long]): Option[Position] =
lineOpt.map(line => Position(line, columnOpt.getOrElse(0L)))
val startPos = toPosition(startLineOpt, startColumnOpt).getOrElse(Position(0L, 0L))
val startPos = toPosition(startLineOpt, startColumnOpt)
.orElse(toPosition(lineOpt, columnOpt))
.getOrElse(Position(0L, 0L))
val endPosOpt = toPosition(endLineOpt, endColumnOpt)
Range(startPos, endPosOpt.getOrElse(startPos))
}