Bump zinc and account for diagnostic code (#1912)

Newer zinc brings in is the changes to `Problem` I made in
sbt/sbt#6874 that expose the diagnostic code of
the diagnostic coming from dotc. I have been doing some work on that on
the compiler side in scala/scala3#15565 and
wanted to try it out with Mill.

I tried to mimic the way you currently have it set up, so let me know if
it's not the direction you'd want to go. However, the idea here would be
that the diagnostic code is forwarded when diagnostics are published via
BSP so that Metals could then capture that code and know what code
actions to offer. You can see more of the big picture in
scala/scala3#14904.

Pull request: #1912

Author: ckipp01

bsp/src/mill/bsp/BspCompileProblemReporter.scala

@@ -130,7 +130,6 @@ class BspCompileProblemReporter(
       pos.endColumn.orElse(pos.pointer).getOrElse[Int](start.getCharacter.intValue())
     )
     val diagnostic = new bsp.Diagnostic(new bsp.Range(start, end), problem.message)
-    diagnostic.setCode(pos.lineContent)
     diagnostic.setSource("mill")
     diagnostic.setSeverity(
       problem.severity match {
@@ -139,6 +138,7 @@ class BspCompileProblemReporter(
         case mill.api.Warn => bsp.DiagnosticSeverity.WARNING
       }
     )
+    problem.diagnosticCode.foreach { existingCode => diagnostic.setCode(existingCode.code) }
     diagnostic
   }
 

main/api/src/mill/api/CompileProblemReporter.scala

@@ -30,6 +30,18 @@ trait Problem {
   def message: String
 
   def position: ProblemPosition
+
+  // TODO Remove default implementation in 0.11.x series
+  def diagnosticCode: Option[DiagnosticCode] = None
+}
+
+/**
+ * Unique diagnostic code given from the compiler with an optional further explanation.
+ */
+trait DiagnosticCode {
+  def code: String
+
+  def explanation: Option[String]
 }
 
 /**

scalalib/worker/src/mill/scalalib/worker/ZincDiagnosticCode.scala

@@ -0,0 +1,12 @@
+package mill.scalalib.worker
+
+import mill.api.internal
+import mill.api.DiagnosticCode
+
+import scala.jdk.OptionConverters._
+
+@internal
+final case class ZincDiagnosticCode(base: xsbti.DiagnosticCode) extends DiagnosticCode {
+  override def code: String = base.code()
+  override def explanation: Option[String] = base.explanation().toScala
+}

scalalib/worker/src/mill/scalalib/worker/ZincProblem.scala

@@ -1,6 +1,8 @@
 package mill.scalalib.worker
 
 import mill.api.{Problem, ProblemPosition, Severity, internal}
+import mill.api.DiagnosticCode
+import scala.jdk.OptionConverters._
 
 @internal
 class ZincProblem(base: xsbti.Problem) extends Problem {
@@ -15,4 +17,7 @@ class ZincProblem(base: xsbti.Problem) extends Problem {
   override def message: String = base.message()
 
   override def position: ProblemPosition = new ZincProblemPosition(base.position())
+
+  override def diagnosticCode: Option[DiagnosticCode] =
+    base.diagnosticCode().toScala.map(ZincDiagnosticCode)
 }

scalalib/worker/src/mill/scalalib/worker/ZincWorkerImpl.scala

@@ -455,6 +455,7 @@ class ZincWorkerImpl(
     val newReporter = reporter match {
       case None => new ManagedLoggedReporter(10, logger)
       case Some(r) => new ManagedLoggedReporter(10, logger) {
+
           override def logError(problem: xsbti.Problem): Unit = {
             r.logError(new ZincProblem(problem))
             super.logError(problem)