carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 12:31:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch custom error stream output to diagnostic (#4846)

Browse Source 
This switches most error printing to use diagnostics instead of direct
stream writes, even when not a specific file diagnostic. I'm allowing
empty filenames for this use-case.

This allows a little more specific testing to validate coverage of
output using the diagnostic coverage test. I'm adding a few tests to
cover things that weren't previously tested.

Separately, this also forces a little more standardization in format...
considering how changes like #4568 show effort being spent to _mirror_
diagnostic style, my thought is now to just use diagnostic code where
possible.

Note this also allows incrementally better testing of the language
server; I'm changing the crash fix from #4847 in favor of diagnostic
testing.

---------

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
Jon Ross-Perkins
2025-01-30 01:58:07 +00:00
committed by GitHub
co-authored by Chandler Carruth
parent 7d2958ad37
commit 7befe2ce9f
57 changed files with 379 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/diagnostics/diagnostic_consumer.cpp
+5 -6
View File
@@ -20,18 +20,18 @@ auto StreamDiagnosticConsumer::HandleDiagnostic(Diagnostic diagnostic) -> void {
message.loc.FormatLocation(*stream_);
switch (message.level) {
case DiagnosticLevel::Error:
*stream_ << ": error";
*stream_ << "error: ";
break;
case DiagnosticLevel::Warning:
*stream_ << ": warning";
*stream_ << "warning: ";
break;
case DiagnosticLevel::Note:
*stream_ << ": note";
*stream_ << "note: ";
break;
case DiagnosticLevel::LocationInfo:
break;
}
*stream_ << ": " << message.format_fn(message);
*stream_ << message.format_fn(message);
if (include_diagnostic_kind_) {
*stream_ << " [" << message.kind << "]";
}
@@ -46,8 +46,7 @@ auto StreamDiagnosticConsumer::HandleDiagnostic(Diagnostic diagnostic) -> void {
}
auto ConsoleDiagnosticConsumer() -> DiagnosticConsumer& {
static auto* consumer = new StreamDiagnosticConsumer(
llvm::errs(), /*include_diagnostic_kind=*/false);
static auto* consumer = new StreamDiagnosticConsumer(&llvm::errs());
return *consumer;
}