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>
52 lines
1.3 KiB
C++
52 lines
1.3 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.h"
|
|
|
|
#include <algorithm>
|
|
#include <cstdint>
|
|
|
|
namespace Carbon {
|
|
|
|
auto DiagnosticLoc::FormatLocation(llvm::raw_ostream& out) const -> void {
|
|
if (filename.empty()) {
|
|
return;
|
|
}
|
|
out << filename;
|
|
if (line_number > 0) {
|
|
out << ":" << line_number;
|
|
if (column_number > 0) {
|
|
out << ":" << column_number;
|
|
}
|
|
}
|
|
out << ": ";
|
|
}
|
|
|
|
auto DiagnosticLoc::FormatSnippet(llvm::raw_ostream& out, int indent) const
|
|
-> void {
|
|
if (column_number == -1) {
|
|
return;
|
|
}
|
|
|
|
// column_number is 1-based.
|
|
int32_t column = column_number - 1;
|
|
|
|
out.indent(indent);
|
|
out << line << "\n";
|
|
out.indent(indent + column);
|
|
out << "^";
|
|
// We want to ensure that we don't underline past the end of the line in
|
|
// case of a multiline token.
|
|
// TODO: Revisit this once we can reference multiple ranges on multiple
|
|
// lines in a single diagnostic message.
|
|
int underline_length =
|
|
std::min(length, static_cast<int32_t>(line.size()) - column);
|
|
for (int i = 1; i < underline_length; ++i) {
|
|
out << '~';
|
|
}
|
|
out << '\n';
|
|
}
|
|
|
|
} // namespace Carbon
|