Don't add explanation twice

som-snytt · Oct 28, 2023 · c17d94c · c17d94c
1 parent 8046a8b
commit c17d94c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala b/compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala
@@ -198,6 +198,7 @@ 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
@@ -48,22 +48,14 @@ public void printSummary(Context ctx) {
   public void doReport(Diagnostic dia, Context ctx) {
     Severity severity = severityOf(dia.level());
     Position position = positionOf(dia.pos().nonInlined());
-
-    StringBuilder rendered = new StringBuilder();
-    rendered.append(messageAndPos(dia, ctx));
     Message message = dia.msg();
-    StringBuilder messageBuilder = new StringBuilder();
-    messageBuilder.append(message.message());
+    StringBuilder messageBuilder = new StringBuilder(message.message());
     String diagnosticCode = String.valueOf(message.errorId().errorNumber());
-    boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
     List<CodeAction> actions = CollectionConverters.asJava(message.actions(ctx));
-    if (shouldExplain && !message.explanation().isEmpty()) {
-      rendered.append(explanation(message, ctx));
+    if (Diagnostic.shouldExplain(dia, ctx) && !message.explanation().isEmpty())
       messageBuilder.append(System.lineSeparator()).append(explanation(message, ctx));
-    }
-
-    delegate.log(new Problem(position, messageBuilder.toString(), severity, rendered.toString(), diagnosticCode, actions,
-      lookupVirtualFileId));
+    Problem problem = new Problem(position, messageBuilder.toString(), severity, messageAndPos(dia, ctx), diagnosticCode, actions, lookupVirtualFileId);
+    delegate.log(problem);
   }
 
   public void reportBasicWarning(String message) {