Skip to content

Backport "Don't add explanation twice" to LTS #20749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WojciechMazur merged 2 commits into from
Jun 23, 2024
Merged

Backport "Don't add explanation twice" to LTS #20749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6eb14fb
Don't add explanation twice
som-snytt Oct 28, 2023
a567054
Leverage string concat, blue explain is not deprecated
som-snytt Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,17 @@ 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());
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());
boolean shouldExplain = Diagnostic.shouldExplain(dia, ctx);
List<CodeAction> actions = CollectionConverters.asJava(message.actions(ctx));
if (shouldExplain && !message.explanation().isEmpty()) {
rendered.append(explanation(message, ctx));
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, text, severity, rendered, diagnosticCode, actions, lookupVirtualFileId);
delegate.log(problem);
}

public void reportBasicWarning(String message) {
Expand Down