mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 13:41:06 +01:00
Move diagnostics into a namespace (#5173)
What this really does is avoids shadowing names, so that we can comfortable have things like `Check::DiagnosticEmitter` or `Check::DiagnosticLoc` without shadowing being a concern. Note, down this path I'm also thinking about: - Renaming misc DiagnosticConsumer/DiagnosticEmitter classes, possibly just to DiagnosticConsumer/DiagnosticEmitter (so `Check::DiagnosticEmitter` instead of `SemIRLocDiagnosticEmitter`). - Dropping `Diagnostic` from `Emitter::DiagnosticBuilder`. - But not for `Check::DiagnosticBuilder`, because `Check::Builder` would be ambiguous. - Renaming diagnostics/diagnostic_* to drop "diagnostic". [Discussion about SemIRLoc -> DiagnosticLoc](https://discord.com/channels/655572317891461132/655578254970716160/1353771570463768698) reminded me of this (in particular the older [Check::DiagnosticBuilder discussion](https://discord.com/channels/655572317891461132/655578254970716160/1344363562608627763)), but I'd only do that rename if there's matching consensus about a path forward where we keep SemIRLoc, and in a way that it's only ever used for diagnostics (the divergence from which is at the root of current LocId discussion). I'm trying to keep that separate from a namespace addition for clarity.
This commit is contained in:
@@ -11,37 +11,37 @@
|
||||
ABSL_FLAG(std::string, testdata_manifest, "",
|
||||
"A path to a file containing repo-relative names of test files.");
|
||||
|
||||
namespace Carbon {
|
||||
namespace Carbon::Diagnostics {
|
||||
namespace {
|
||||
|
||||
constexpr DiagnosticKind DiagnosticKinds[] = {
|
||||
#define CARBON_DIAGNOSTIC_KIND(Name) DiagnosticKind::Name,
|
||||
constexpr Kind Kinds[] = {
|
||||
#define CARBON_DIAGNOSTIC_KIND(Name) Kind::Name,
|
||||
#include "toolchain/diagnostics/diagnostic_kind.def"
|
||||
};
|
||||
|
||||
constexpr DiagnosticKind UntestedDiagnosticKinds[] = {
|
||||
constexpr Kind UntestedKinds[] = {
|
||||
// These exist only for unit tests.
|
||||
DiagnosticKind::TestDiagnostic,
|
||||
DiagnosticKind::TestDiagnosticNote,
|
||||
Kind::TestDiagnostic,
|
||||
Kind::TestDiagnosticNote,
|
||||
|
||||
// Diagnosing erroneous install conditions, but test environments are
|
||||
// typically correct.
|
||||
DiagnosticKind::CompilePreludeManifestError,
|
||||
DiagnosticKind::DriverInstallInvalid,
|
||||
Kind::CompilePreludeManifestError,
|
||||
Kind::DriverInstallInvalid,
|
||||
|
||||
// These diagnose filesystem issues that are hard to unit test.
|
||||
DiagnosticKind::ErrorReadingFile,
|
||||
DiagnosticKind::ErrorStattingFile,
|
||||
DiagnosticKind::FileTooLarge,
|
||||
Kind::ErrorReadingFile,
|
||||
Kind::ErrorStattingFile,
|
||||
Kind::FileTooLarge,
|
||||
|
||||
// These aren't feasible to test with a normal testcase, but are tested in
|
||||
// lex/tokenized_buffer_test.cpp.
|
||||
DiagnosticKind::TooManyTokens,
|
||||
DiagnosticKind::UnsupportedCrLineEnding,
|
||||
DiagnosticKind::UnsupportedLfCrLineEnding,
|
||||
Kind::TooManyTokens,
|
||||
Kind::UnsupportedCrLineEnding,
|
||||
Kind::UnsupportedLfCrLineEnding,
|
||||
|
||||
// This is a little long but is tested in lex/numeric_literal_test.cpp.
|
||||
DiagnosticKind::TooManyDigits,
|
||||
Kind::TooManyDigits,
|
||||
|
||||
// TODO: This can only fire if the first message in a diagnostic is rooted
|
||||
// in a file other than the file being compiled. The language server
|
||||
@@ -50,16 +50,16 @@ constexpr DiagnosticKind UntestedDiagnosticKinds[] = {
|
||||
// in the current file.
|
||||
// - Require all diagnostics produced by compiling have their first location
|
||||
// be in the file being compiled, never an import.
|
||||
DiagnosticKind::LanguageServerDiagnosticInWrongFile,
|
||||
Kind::LanguageServerDiagnosticInWrongFile,
|
||||
};
|
||||
|
||||
// Looks for diagnostic kinds that aren't covered by a file_test.
|
||||
TEST(Coverage, DiagnosticKind) {
|
||||
TEST(Coverage, Kind) {
|
||||
Testing::TestKindCoverage(absl::GetFlag(FLAGS_testdata_manifest),
|
||||
R"(^ *// CHECK:STDERR: .* \[(\w+)\]$)",
|
||||
llvm::ArrayRef(DiagnosticKinds),
|
||||
llvm::ArrayRef(UntestedDiagnosticKinds));
|
||||
llvm::ArrayRef(Kinds),
|
||||
llvm::ArrayRef(UntestedKinds));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace Carbon
|
||||
} // namespace Carbon::Diagnostics
|
||||
|
||||
Reference in New Issue
Block a user