Leverage string concat, blue explain is not deprecated

[Cherry-picked 5b5e67e]
scala · Jun 23, 2024 · 6892e70 · 6892e70
1 parent dd0bfac
commit 6892e70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -198,7 +198,6 @@ trait MessageRendering {
   end posStr
 
   /** Explanation rendered under "Explanation" header */
-  @deprecated("Explanations are rendered with the message text", since="3.4")
   def explanation(m: Message)(using Context): String = {
     val sb = new StringBuilder(
       s"""|

diff --git a/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java b/sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
@@ -49,12 +49,15 @@ public void doReport(Diagnostic dia, Context ctx) {
     Severity severity = severityOf(dia.level());
     Position position = positionOf(dia.pos().nonInlined());
     Message message = dia.msg();
-    StringBuilder messageBuilder = new StringBuilder(message.message());
+    String text;
+    if (Diagnostic.shouldExplain(dia, ctx) && !message.explanation().isEmpty())
+      text = message.message() + System.lineSeparator() + explanation(message, ctx);
+    else
+      text = message.message();
+    String rendered = messageAndPos(dia, ctx);
     String diagnosticCode = String.valueOf(message.errorId().errorNumber());
     List<CodeAction> actions = CollectionConverters.asJava(message.actions(ctx));
-    if (Diagnostic.shouldExplain(dia, ctx) && !message.explanation().isEmpty())
-      messageBuilder.append(System.lineSeparator()).append(explanation(message, ctx));
-    Problem problem = new Problem(position, messageBuilder.toString(), severity, messageAndPos(dia, ctx), diagnosticCode, actions, lookupVirtualFileId);
+    Problem problem = new Problem(position, text, severity, rendered, diagnosticCode, actions, lookupVirtualFileId);
     delegate.log(problem);
   }