bugfix: Switch to AnalysisCallback2

Author: tgodzik

backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala

@@ -37,8 +37,11 @@ import xsbti.compile.ClassFileManager
 import xsbti.compile.IncOptions
 import xsbti.compile.Output
 import xsbti.compile.analysis.ReadStamps
+import xsbti.{Action, DiagnosticCode, DiagnosticRelatedInformation}
 
-trait IBloopAnalysisCallback extends xsbti.AnalysisCallback {
+import collection.JavaConverters._
+
+trait IBloopAnalysisCallback extends xsbti.AnalysisCallback2 {
   def get: Analysis
 }
 
@@ -118,21 +121,46 @@ final class BloopAnalysisCallback(
     startSource(converter.toVirtualFile(source.toPath()))
   }
 
-  def problem(
+  def problem2(
       category: String,
       pos: Position,
       msg: String,
       severity: Severity,
-      reported: Boolean
+      reported: Boolean,
+      rendered: ju.Optional[String],
+      diagnosticCode: ju.Optional[DiagnosticCode],
+      diagnosticRelatedInformation: ju.List[DiagnosticRelatedInformation],
+      actions: ju.List[Action]
   ): Unit = {
     for (source <- InterfaceUtil.jo2o(pos.sourceFile)) {
       val map = if (reported) reportedProblems else unreportedProblems
       map
         .getOrElseUpdate(source.toPath(), new mutable.ListBuffer())
-        .+=(InterfaceUtil.problem(category, pos, msg, severity, None, None, Nil))
+        .+=(
+          InterfaceUtil.problem(
+            category,
+            pos,
+            msg,
+            severity,
+            None,
+            InterfaceUtil.toOption(diagnosticCode),
+            diagnosticRelatedInformation.asScala.toList,
+            actions.asScala.toList
+          )
+        )
     }
   }
 
+  def problem(
+      category: String,
+      pos: Position,
+      msg: String,
+      severity: Severity,
+      reported: Boolean
+  ): Unit = {
+    problem(category, pos, msg, severity, reported)
+  }
+
   def classDependency(
       onClassName: String,
       sourceClassName: String,

backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala

@@ -35,6 +35,9 @@ import xsbti.compile.ClassFileManager
 import xsbti.compile.IncOptions
 import xsbti.compile.Output
 import xsbti.compile.analysis.ReadStamps
+import xsbti.{Action, DiagnosticCode, DiagnosticRelatedInformation}
+
+import collection.JavaConverters._
 
 /**
  * This class provides a thread-safe implementation of `xsbti.AnalysisCallback` which is required to compile with the
@@ -123,21 +126,56 @@ final class ConcurrentAnalysisCallback(
     startSource(converter.toVirtualFile(source.toPath()))
   }
 
-  def problem(
+  def problem2(
       category: String,
       pos: Position,
       msg: String,
       severity: Severity,
-      reported: Boolean
+      reported: Boolean,
+      rendered: ju.Optional[String],
+      diagnosticCode: ju.Optional[DiagnosticCode],
+      diagnosticRelatedInformation: ju.List[DiagnosticRelatedInformation],
+      actions: ju.List[Action]
   ): Unit = {
     for (source <- InterfaceUtil.jo2o(pos.sourceFile)) {
       val map = if (reported) reportedProblems else unreportedProblems
       map
         .getOrElseUpdate(source.toPath(), new ConcurrentLinkedQueue)
-        .add(InterfaceUtil.problem(category, pos, msg, severity, None, None, Nil))
+        .add(
+          InterfaceUtil.problem(
+            category,
+            pos,
+            msg,
+            severity,
+            None,
+            InterfaceUtil.toOption(diagnosticCode),
+            diagnosticRelatedInformation.asScala.toList,
+            actions.asScala.toList
+          )
+        )
     }
   }
 
+  def problem(
+      category: String,
+      pos: Position,
+      msg: String,
+      severity: Severity,
+      reported: Boolean
+  ): Unit = {
+    problem2(
+      category,
+      pos,
+      msg,
+      severity,
+      reported,
+      rendered = ju.Optional.empty(),
+      diagnosticCode = ju.Optional.empty(),
+      diagnosticRelatedInformation = Nil.asJava,
+      actions = Nil.asJava
+    )
+  }
+
   def classDependency(
       onClassName: String,
       sourceClassName: String,