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

fix BuildServerReporter

This commit is contained in:
Adrien Piquerez 2020-05-13 18:26:31 +02:00
parent 24f6a6f290
commit f3bce7e976
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,11 @@
package sbt.internal.server package sbt.internal.server
import java.io.File
import sbt.StandardMain import sbt.StandardMain
import sbt.internal.bsp._ import sbt.internal.bsp._
import sbt.internal.inc.ManagedLoggedReporter import sbt.internal.inc.ManagedLoggedReporter
import sbt.internal.util.ManagedLogger import sbt.internal.util.ManagedLogger
import xsbti.compile.CompileAnalysis import xsbti.compile.CompileAnalysis
import xsbti.{ FileConverter, Problem, Severity, Position => XPosition } import xsbti.{ BasicVirtualFileRef, FileConverter, Problem, Severity, Position => XPosition }
import scala.collection.mutable import scala.collection.mutable
@ -32,7 +30,7 @@ class BuildServerReporter(
lazy val exchange = StandardMain.exchange lazy val exchange = StandardMain.exchange
private[sbt] lazy val problemsByFile = new mutable.HashMap[File, mutable.ListBuffer[Problem]] private[sbt] lazy val problemsByFile = new mutable.HashMap[String, mutable.ListBuffer[Problem]]
override def reset(): Unit = { override def reset(): Unit = {
super.reset() super.reset()
@ -41,10 +39,10 @@ class BuildServerReporter(
override def log(problem: Problem): Unit = { override def log(problem: Problem): Unit = {
val pos = problem.position val pos = problem.position
pos.sourceFile.toOption foreach { sourceFile: File => pos.sourcePath().toOption foreach { sourcePath =>
problemsByFile.get(sourceFile) match { problemsByFile.get(sourcePath) match {
case Some(xs: mutable.ListBuffer[Problem]) => problemsByFile(sourceFile) = xs :+ problem case Some(xs: mutable.ListBuffer[Problem]) => problemsByFile(sourcePath) = xs :+ problem
case _ => problemsByFile(sourceFile) = mutable.ListBuffer(problem) case _ => problemsByFile(sourcePath) = mutable.ListBuffer(problem)
} }
} }
super.log(problem) super.log(problem)
@ -86,14 +84,14 @@ class BuildServerReporter(
} }
private[sbt] def aggregateProblems(problem: Problem): Unit = { private[sbt] def aggregateProblems(problem: Problem): Unit = {
val pos = problem.position val pos = problem.position
pos.sourceFile.toOption foreach { sourceFile: File => pos.sourcePath().toOption foreach { sourcePath: String =>
problemsByFile.get(sourceFile) match { problemsByFile.get(sourcePath) match {
case Some(xs: mutable.ListBuffer[Problem]) => case Some(xs: mutable.ListBuffer[Problem]) =>
val diagnostics = toDiagnostics(xs) val diagnostics = toDiagnostics(xs)
val absolutePath = converter.toPath(new BasicVirtualFileRef(sourcePath) {})
val params = PublishDiagnosticsParams( val params = PublishDiagnosticsParams(
TextDocumentIdentifier(sourceFile.toURI), TextDocumentIdentifier(absolutePath.toUri),
buildTarget, buildTarget,
originId = None, originId = None,
diagnostics, diagnostics,