feat: capture diagnostic code from Problem

Author: ckipp01

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

@@ -94,7 +94,7 @@ 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)
+        Problem(problemID, p.severity, p.message, mappedPos, p.category, p.diagnosticCode())
     }
   }
 

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

@@ -91,7 +91,7 @@ final class BspServerLogger private (
     val problemPos = event.problem.position
     val problemSeverity = event.problem.severity
     val sourceFile = toOption(problemPos.sourceFile())
-    // TODO: Add code content
+    val code = toOption(event.problem.diagnosticCode()).map(_.code())
 
     (problemPos, sourceFile) match {
       case (ZincInternals.ZincExistsStartPos(startLine, startColumn), Some(file)) =>
@@ -109,7 +109,7 @@ final class BspServerLogger private (
         val source = Some("bloop")
         val uri = bsp.Uri(file.toPath.toUri)
         val severity = bspSeverity(problemSeverity)
-        val diagnostic = bsp.Diagnostic(pos, Some(severity), None, source, message, None)
+        val diagnostic = bsp.Diagnostic(pos, Some(severity), code, source, message, None)
         val textDocument = bsp.TextDocumentIdentifier(uri)
         val buildTargetId = bsp.BuildTargetIdentifier(event.projectUri)
         Build.publishDiagnostics.notify(

project/Dependencies.scala

@@ -14,7 +14,7 @@ object Dependencies {
   val nailgunCommit = "a2520c1e"
 
   // Keep in sync in BloopComponentCompiler
-  val zincVersion = "1.6.0"
+  val zincVersion = "1.7.1"
 
   val bspVersion = "2.0.0-M13"
   val javaDebugVersion = "0.21.0+1-7f1080f1"

shared/src/main/scala/bloop/reporter/Problem.scala

@@ -1,5 +1,7 @@
 package bloop.reporter
 
+import java.util.Optional
+
 import xsbti.Severity
 
 /** Describes a problem (error, warning, message, etc.) given to the reporter. */
@@ -13,12 +15,21 @@ final case class Problem private (
     /** Position in the source code where the message was triggered */
     position: xsbti.Position,
     /** The category of this problem. */
-    category: String
+    category: String,
+    /** Unique code attatched to the diagnostic being reported */
+    override val diagnosticCode: Optional[xsbti.DiagnosticCode]
 ) extends xsbti.Problem
 
 object Problem {
   def fromZincProblem(problem: xsbti.Problem): Problem = {
-    Problem(-1, problem.severity(), problem.message(), problem.position(), problem.category())
+    Problem(
+      -1,
+      problem.severity(),
+      problem.message(),
+      problem.position(),
+      problem.category(),
+      problem.diagnosticCode()
+    )
   }
 
   case class DiagnosticsCount(errors: Long, warnings: Long) {