mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-PerkinsandChandler Carruth
7befe2ce9f
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>
54 lines
1.5 KiB
C++
54 lines
1.5 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/diagnostics/diagnostic_consumer.h"
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
|
|
namespace Carbon {
|
|
|
|
auto StreamDiagnosticConsumer::HandleDiagnostic(Diagnostic diagnostic) -> void {
|
|
if (printed_diagnostic_) {
|
|
*stream_ << "\n";
|
|
} else {
|
|
printed_diagnostic_ = true;
|
|
}
|
|
|
|
for (const auto& message : diagnostic.messages) {
|
|
message.loc.FormatLocation(*stream_);
|
|
switch (message.level) {
|
|
case DiagnosticLevel::Error:
|
|
*stream_ << "error: ";
|
|
break;
|
|
case DiagnosticLevel::Warning:
|
|
*stream_ << "warning: ";
|
|
break;
|
|
case DiagnosticLevel::Note:
|
|
*stream_ << "note: ";
|
|
break;
|
|
case DiagnosticLevel::LocationInfo:
|
|
break;
|
|
}
|
|
*stream_ << message.format_fn(message);
|
|
if (include_diagnostic_kind_) {
|
|
*stream_ << " [" << message.kind << "]";
|
|
}
|
|
*stream_ << "\n";
|
|
// Don't include a snippet for location information to keep this diagnostic
|
|
// more visually associated with the following diagnostic that it describes
|
|
// and to better match C++ compilers.
|
|
if (message.level != DiagnosticLevel::LocationInfo) {
|
|
message.loc.FormatSnippet(*stream_);
|
|
}
|
|
}
|
|
}
|
|
|
|
auto ConsoleDiagnosticConsumer() -> DiagnosticConsumer& {
|
|
static auto* consumer = new StreamDiagnosticConsumer(&llvm::errs());
|
|
return *consumer;
|
|
}
|
|
|
|
} // namespace Carbon
|