Skip to content

Commit a567054

Browse files
som-snyttWojciechMazur
authored andcommitted
Leverage string concat, blue explain is not deprecated
[Cherry-picked 5b5e67e]
1 parent 6eb14fb commit a567054

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

compiler/src/dotty/tools/dotc/reporting/MessageRendering.scala

-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ trait MessageRendering {
198198
end posStr
199199

200200
/** Explanation rendered under "Explanation" header */
201-
@deprecated("Explanations are rendered with the message text", since="3.4")
202201
def explanation(m: Message)(using Context): String = {
203202
val sb = new StringBuilder(
204203
s"""|

sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,15 @@ public void doReport(Diagnostic dia, Context ctx) {
4949
Severity severity = severityOf(dia.level());
5050
Position position = positionOf(dia.pos().nonInlined());
5151
Message message = dia.msg();
52-
StringBuilder messageBuilder = new StringBuilder(message.message());
52+
String text;
53+
if (Diagnostic.shouldExplain(dia, ctx) && !message.explanation().isEmpty())
54+
text = message.message() + System.lineSeparator() + explanation(message, ctx);
55+
else
56+
text = message.message();
57+
String rendered = messageAndPos(dia, ctx);
5358
String diagnosticCode = String.valueOf(message.errorId().errorNumber());
5459
List<CodeAction> actions = CollectionConverters.asJava(message.actions(ctx));
55-
if (Diagnostic.shouldExplain(dia, ctx) && !message.explanation().isEmpty())
56-
messageBuilder.append(System.lineSeparator()).append(explanation(message, ctx));
57-
Problem problem = new Problem(position, messageBuilder.toString(), severity, messageAndPos(dia, ctx), diagnosticCode, actions, lookupVirtualFileId);
60+
Problem problem = new Problem(position, text, severity, rendered, diagnosticCode, actions, lookupVirtualFileId);
5861
delegate.log(problem);
5962
}
6063

0 commit comments

Comments
 (0)