mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 22:02:28 +01:00
Richard Smith
2e63da1a40
Also surround it in square brackets rather than parentheses. This matches the format used by Clang and GCC, and means diagnostics will still match the `file:line:col: error: ` pattern used by some IDE tools. Before: ```console fail_builtins.carbon:11:11: error(AliasRequiresNameRef): alias initializer must be a name reference ``` After: ```console fail_builtins.carbon:11:11: error: alias initializer must be a name reference [AliasRequiresNameRef] ``` Also tighten up test regex to only match on `STDERR` lines that list a file name.
55 lines
1.6 KiB
C++
55 lines
1.6 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(), /*include_diagnostic_kind=*/false);
|
|
return *consumer;
|
|
}
|
|
|
|
} // namespace Carbon
|