build(deps): Update zinc from 1.8.1 to 1.9.1

backend/src/main/scala/bloop/reporter/Reporter.scala

@@ -94,7 +94,16 @@ abstract class Reporter(
       case _ =>
         val mappedPos = p.position
         val problemID = if (p.position.sourceFile.isPresent) nextID() else -1
-        Problem(problemID, p.severity, p.message, mappedPos, p.category, p.diagnosticCode())
+        Problem(
+          problemID,
+          p.severity,
+          p.message,
+          mappedPos,
+          p.category,
+          p.diagnosticCode(),
+          p.diagnosticRelatedInformation(),
+          p.actions()
+        )
     }
   }
 

frontend/src/main/scala/bloop/logging/BspServerLogger.scala

@@ -1,7 +1,10 @@
 package bloop.logging
 
+import java.util.Optional
 import java.util.concurrent.atomic.AtomicInteger
 
+import scala.collection.JavaConverters._
+
 import ch.epfl.scala.bsp
 import ch.epfl.scala.bsp.BuildTargetIdentifier
 import ch.epfl.scala.bsp.DiagnosticSeverity
@@ -16,6 +19,7 @@ import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 import jsonrpc4s.RawJson
 import monix.execution.atomic.AtomicInt
 import sbt.internal.inc.bloop.ZincInternals
+import sbt.util.InterfaceUtil
 import xsbti.DiagnosticRelatedInformation
 import xsbti.Position
 import xsbti.Severity
@@ -133,15 +137,43 @@ final class BspServerLogger private (
       })
   }
 
+  private def toExistingBspPosition(pos: xsbti.Position): Option[bsp.Range] = {
+    def asIntPos(opt: Optional[Integer]) = InterfaceUtil.toOption(opt).map(_.toInt)
+    for {
+      startLine <- asIntPos(pos.startLine())
+      startColumn <- asIntPos(pos.startColumn())
+      endLine <- asIntPos(pos.endLine())
+      endColumn <- asIntPos(pos.endColumn())
+    } yield bsp.Range(
+      bsp.Position(startLine - 1, startColumn),
+      bsp.Position(endLine - 1, endColumn)
+    )
+  }
+
+  private def toScalaDiagnostic(actions: java.util.List[xsbti.Action]): bsp.ScalaDiagnostic = {
+    val bspActions = actions.asScala.map { action =>
+      val description = InterfaceUtil.toOption(action.description())
+      val edits = action.edit().changes().asScala.flatMap { edit =>
+        toExistingBspPosition(edit.position()).map { range =>
+          bsp.ScalaTextEdit(range, edit.newText())
+        }
+      }
+      val workspaceEdit = bsp.ScalaWorkspaceEdit(Option(edits.toList))
+      bsp.ScalaAction(action.title(), description, Some(workspaceEdit))
+    }
+    bsp.ScalaDiagnostic(Some(bspActions.toList))
+  }
+
   def diagnostic(event: CompilationEvent.Diagnostic): Unit = {
-    import sbt.util.InterfaceUtil.toOption
-    import scala.collection.JavaConverters._
     val message = event.problem.message
     val problemPos = event.problem.position
     val problemSeverity = event.problem.severity
-    val sourceFile = toOption(problemPos.sourceFile())
-    val code = toOption(event.problem.diagnosticCode()).map(_.code())
-
+    val sourceFile = InterfaceUtil.toOption(problemPos.sourceFile())
+    val code = InterfaceUtil.toOption(event.problem.diagnosticCode()).map(_.code())
+    lazy val scalaDiagnostic = toScalaDiagnostic(event.problem.actions())
+    lazy val diagnosticAsRawJson = RawJson(
+      writeToArray(scalaDiagnostic)(bsp.ScalaDiagnostic.codec)
+    )
     (problemPos, sourceFile) match {
       case (ZincInternals.ZincExistsStartPos(startLine, startColumn), Some(file)) =>
         // Lines in Scalac are indexed by 1, BSP expects 0-index positions
@@ -159,14 +191,14 @@ final class BspServerLogger private (
             message,
             bspRelatedInformation(
               event.problem
-                .diagnosticRelatedInforamation()
+                .diagnosticRelatedInformation()
                 .asScala
                 .toList,
               startLine,
               startColumn
             ),
             None,
-            None
+            Option(diagnosticAsRawJson)
           )
         val textDocument = bsp.TextDocumentIdentifier(uri)
         val buildTargetId = bsp.BuildTargetIdentifier(event.projectUri)
@@ -194,14 +226,14 @@ final class BspServerLogger private (
             message,
             bspRelatedInformation(
               event.problem
-                .diagnosticRelatedInforamation()
+                .diagnosticRelatedInformation()
                 .asScala
                 .toList,
               startLine = 0,
               startColumn = 0
             ),
             None,
-            None
+            Option(diagnosticAsRawJson)
           )
         val textDocument = bsp.TextDocumentIdentifier(uri)
         val buildTargetId = bsp.BuildTargetIdentifier(event.projectUri)

frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties

@@ -1 +1,2 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
+

frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties

@@ -1 +1,2 @@
-sbt.version=1.7.2
+sbt.version=1.9.0
+

frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/custom-test-framework/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/no-test-frameworks/project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/scala-seed-project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/resources/simple-build/project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.0

frontend/src/test/scala/bloop/DeduplicationSpec.scala

@@ -567,7 +567,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling b (1 Scala source)
             |  -> Data kind: compile-task
             |#1: b/src/B.scala
-            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#1: task finish 2
             |  -> errors 1, warnings 0
@@ -648,7 +648,7 @@ object DeduplicationSpec extends bloop.bsp.BspBaseSuite {
             |  -> Msg: Compiling b (1 Scala source)
             |  -> Data kind: compile-task
             |#2: b/src/B.scala
-            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: task finish 4
             |  -> errors 1, warnings 0

frontend/src/test/scala/bloop/TestSpec.scala

@@ -389,24 +389,27 @@ object JvmTestSpec extends BaseTestSpec("test-project-test", "cross-test-build-s
 }
 
 object NoTestFrameworksSpec extends ProjectBaseSuite("no-test-frameworks") {
-  testProject("must have frameworks in test project", runOnlyOnJava8 = false) { (build, logger) =>
-    val project = build.projectFor("myProject")
-    val testState = build.state.test(project)
-    try {
-      assert(!testState.status.isOk)
-      assert(logger.errors.contains("Missing configured test frameworks in myProject-test"))
-    } catch { case err: AssertionError => logger.dump(); throw err }
+  testProjectTask("must have frameworks in test project", runOnlyOnJava8 = false) {
+    (build, logger) =>
+      val project = build.projectFor("myProject")
+      build.state.testTask(project).map { testState =>
+        try {
+          assert(!testState.status.isOk)
+          assert(logger.errors.contains("Missing configured test frameworks in myProject-test"))
+        } catch { case err: AssertionError => logger.dump(); throw err }
+      }
   }
 
-  testProject("non-test projects can have empty frameworks", runOnlyOnJava8 = false) {
+  testProjectTask("non-test projects can have empty frameworks", runOnlyOnJava8 = false) {
     (rawBuild, logger) =>
       val build = rawBuild.filterProjectsByName(!_.endsWith("-test"))
       val project = build.projectFor("myProject")
-      val testState = build.state.test(project)
-      try {
-        assert(testState.status.isOk)
-        // No message is logged - this is not a test target, and therefore it is ignored.
-      } catch { case err: AssertionError => logger.dump(); throw err }
+      build.state.testTask(project).map { testState =>
+        try {
+          assert(testState.status.isOk)
+          // No message is logged - this is not a test target, and therefore it is ignored.
+        } catch { case err: AssertionError => logger.dump(); throw err }
+      }
   }
 }
 

frontend/src/test/scala/bloop/bsp/BspCompileSpec.scala

@@ -162,7 +162,7 @@ class BspCompileSpec(
              |  -> Msg: Compiling a (1 Scala source)
              |  -> Data kind: compile-task
              |#1: a/src/Foo.scala
-             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Warning),Some(_),Some(_),Unused import,None,None,None))
+             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
              |  -> reset = true
              |  -> origin = test-origin
              |#1: task finish 1
@@ -317,7 +317,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#2: a/src/main/scala/Foo.scala
-            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,28),Position(2,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: task finish 3
             |  -> errors 1, warnings 0
@@ -558,7 +558,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#2: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(2,6),Position(2,6)),Some(Error),Some(_),Some(_),x is already defined as value x,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,6),Position(2,6)),Some(Error),Some(_),Some(_),x is already defined as value x,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: task finish 2
             |  -> errors 1, warnings 0
@@ -605,10 +605,10 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#4: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(3,6),Position(3,6)),Some(Error),Some(_),Some(_),x is already defined as value x,None,None,None))
+            |  -> List(Diagnostic(Range(Position(3,6),Position(3,6)),Some(Error),Some(_),Some(_),x is already defined as value x,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#4: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,None))
+            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
             |  -> reset = false
             |#4: task finish 4
             |  -> errors 1, warnings 1
@@ -628,7 +628,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#5: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,None))
+            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#5: task finish 5
             |  -> errors 0, warnings 1
@@ -664,10 +664,10 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#6: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,None))
+            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#6: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(1,0),Position(3,1)),Some(Error),Some(_),Some(_),object creation impossible, since value y in trait Base of type Int is not defined,None,None,None))
+            |  -> List(Diagnostic(Range(Position(1,0),Position(3,1)),Some(Error),Some(_),Some(_),object creation impossible, since value y in trait Base of type Int is not defined,None,None,Some({"actions":[]})))
             |  -> reset = false
             |#6: task finish 6
             |  -> errors 1, warnings 1
@@ -688,7 +688,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#7: a/src/A.scala
-            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,None))
+            |  -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#7: task finish 7
             |  -> errors 0, warnings 0
@@ -747,7 +747,7 @@ class BspCompileSpec(
             |  -> Msg: Start no-op compilation for a
             |  -> Data kind: compile-task
             |#1: a/src/main/scala/App.scala
-            |  -> List(Diagnostic(Range(Position(2,4),Position(2,4)),Some(Warning),Some(_),Some(_),a pure expression does nothing in statement position,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,4),Position(2,4)),Some(Warning),Some(_),Some(_),a pure expression does nothing in statement position,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#1: task finish 1
             |  -> errors 0, warnings 0
@@ -808,7 +808,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#1: a/src/main/scala/App.scala
-            |  -> List(Diagnostic(Range(Position(2,4),Position(2,4)),Some(Warning),Some(_),Some(_),a pure expression does nothing in statement position,None,None,None))
+            |  -> List(Diagnostic(Range(Position(2,4),Position(2,4)),Some(Warning),Some(_),Some(_),a pure expression does nothing in statement position,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#1: task finish 1
             |  -> errors 0, warnings 0
@@ -908,7 +908,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#1: a/src/main/scala/Foo.scala
-            |  -> List(Diagnostic(Range(Position(1,28),Position(1,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,None))
+            |  -> List(Diagnostic(Range(Position(1,28),Position(1,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#1: task finish 1
             |  -> errors 1, warnings 0
@@ -940,7 +940,7 @@ class BspCompileSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#2: a/src/main/scala/Bar.scala
-            |  -> List(Diagnostic(Range(Position(1,28),Position(1,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,None))
+            |  -> List(Diagnostic(Range(Position(1,28),Position(1,28)),Some(Error),Some(_),Some(_),type mismatch;  found   : Int  required: String,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: a/src/main/scala/Foo.scala
             |  -> List()
@@ -1039,7 +1039,7 @@ class BspCompileSpec(
              |  -> Msg: Compiling a (3 Scala sources)
              |  -> Data kind: compile-task
              |#1: a/src/Foo.scala
-             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,None))
+             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
              |  -> reset = true
              |#1: task finish 1
              |  -> errors 1, warnings 0
@@ -1102,10 +1102,10 @@ class BspCompileSpec(
              |  -> Msg: Compiling a (1 Scala source)
              |  -> Data kind: compile-task
              |#3: a/src/Foo.scala
-             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,None))
+             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
              |  -> reset = true
              |#3: a/src/Foo.scala
-             |  -> List(Diagnostic(Range(Position(1,0),Position(1,7)),Some(Error),Some(_),Some(_),Unused import,None,None,None))
+             |  -> List(Diagnostic(Range(Position(1,0),Position(1,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
              |  -> reset = false
              |#3: task finish 5
              |  -> errors 2, warnings 0
@@ -1120,7 +1120,7 @@ class BspCompileSpec(
              |  -> Msg: Compiling b (1 Scala source)
              |  -> Data kind: compile-task
              |#3: b/src/Buzz.scala
-             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,None))
+             |  -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
              |  -> reset = true
              |#3: task finish 6
              |  -> errors 1, warnings 0

frontend/src/test/scala/bloop/bsp/BspSbtClientSpec.scala

@@ -285,7 +285,7 @@ class BspSbtClientSpec(
             |  -> Msg: Compiling a (1 Scala source)
             |  -> Data kind: compile-task
             |#2: a/src/main/scala/Foo.scala
-            |  -> List(Diagnostic(Range(Position(1,3),Position(1,3)),Some(Error),Some(_),Some(_),';' expected but 'def' found.,None,None,None))
+            |  -> List(Diagnostic(Range(Position(1,3),Position(1,3)),Some(Error),Some(_),Some(_),';' expected but 'def' found.,None,None,Some({"actions":[]})))
             |  -> reset = true
             |#2: task finish 2
             |  -> errors 1, warnings 0

frontend/src/test/scala/bloop/testing/BloopHelpers.scala

@@ -222,6 +222,10 @@ trait BloopHelpers {
       test(project, Nil, Nil)
     }
 
+    def testTask(project: TestProject): Task[TestState] = {
+      testTask(project, Nil, Nil)
+    }
+
     def testHandle(
         project: TestProject,
         only: List[String],

frontend/src/test/scala/bloop/testing/ProjectBaseSuite.scala

@@ -5,6 +5,8 @@ import java.nio.file.Files
 import bloop.io.AbsolutePath
 import bloop.io.Paths
 import bloop.logging.RecordingLogger
+import bloop.task.Task
+import scala.concurrent.duration.Duration
 
 class ProjectBaseSuite(buildName: String) extends BaseSuite {
   val workspace: AbsolutePath = AbsolutePath(Files.createTempDirectory(s"workspace-${buildName}"))
@@ -22,6 +24,19 @@ class ProjectBaseSuite(buildName: String) extends BaseSuite {
     else test(name)(fun(newBuild, newLogger))
   }
 
+  def testProjectTask(
+      name: String,
+      runOnlyOnJava8: Boolean,
+      maxDuration: Duration = Duration("60s")
+  )(
+      fun: (TestBuild, RecordingLogger) => Task[Unit]
+  ): Unit = {
+    val newLogger = new RecordingLogger(ansiCodesSupported = false)
+    val newBuild = build.withLogger(newLogger)
+    if (runOnlyOnJava8) testOnlyOnJava8(name)(fun(newBuild, newLogger))
+    else testTask(name, maxDuration)(fun(newBuild, newLogger))
+  }
+
   override def test(name: String)(fun: => Any): Unit = {
     super.test(name)(fun)
   }