Attach explanation message to diagnostic message

G1ng3r · Jan 30, 2023 · 18a8a09 · 18a8a09
1 parent a51b590
commit 18a8a09
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
@@ -39,13 +39,16 @@ public void doReport(Diagnostic dia, Context ctx) {
     StringBuilder rendered = new StringBuilder();
     rendered.append(messageAndPos(dia, ctx));
     Message message = dia.msg();
+    StringBuilder messageBuilder = new StringBuilder();
+    messageBuilder.append(message.message());
     String diagnosticCode = String.valueOf(message.errorId().errorNumber());
     boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
     if (shouldExplain && !message.explanation().isEmpty()) {
       rendered.append(explanation(message, ctx));
+      messageBuilder.append(System.lineSeparator()).append(explanation(message, ctx));
     }
 
-    delegate.log(new Problem(position, message.message(), severity, rendered.toString(), diagnosticCode));
+    delegate.log(new Problem(position, messageBuilder.toString(), severity, rendered.toString(), diagnosticCode));
   }
 
   private static Severity severityOf(int level) {