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

Drop "diagnostic" from some filenames in the "diagnostics" folder (#6686)

Browse Source 
Mainly because "sorting_diagnostic_consumer" is legacy, since
`SortingDiagnosticConsumer` became `SortingConsumer`. Also better
reflecting contents of these files.

Where I'm not renaming, I'm less positive about dropping "diagnostics"
from "file_diagnostics" and "null_diagnostics" (which contain both a
consumer and emitter, and "null.h" seems like poor naming), so not doing
that here. Also "diagnostic.h" contains `struct Diagnostic`, so is a
decent fit.

Assisted-by: Google Antigravity with Gemini 3 Flash
This commit is contained in:
Jon Ross-Perkins
2026-02-04 17:24:55 +00:00
committed by GitHub
parent e5b05a1fac
commit 45ca3d28f5
70 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/diagnostics/sorting_consumer_test.cpp
+63
View File
@@ -0,0 +1,63 @@
// 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/sorting_consumer.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include "llvm/ADT/StringRef.h"
#include "toolchain/diagnostics/emitter.h"
#include "toolchain/diagnostics/mocks.h"
namespace Carbon::Diagnostics {
namespace {
using ::Carbon::Testing::IsSingleDiagnostic;
using ::testing::_;
using ::testing::InSequence;
CARBON_DIAGNOSTIC(TestDiagnostic, Error, "M{0}", int);
class FakeEmitter : public Emitter<int32_t> {
public:
using Emitter::Emitter;
protected:
auto ConvertLoc(int32_t last_byte_offset, ContextFnT /*context_fn*/) const
-> ConvertedLoc override {
return {.loc = {}, .last_byte_offset = last_byte_offset};
}
};
TEST(SortedEmitterTest, SortErrors) {
Testing::MockDiagnosticConsumer consumer;
SortingConsumer sorting_consumer(consumer);
FakeEmitter emitter(&sorting_consumer);
emitter.Emit(1, TestDiagnostic, 1);
emitter.Emit(-1, TestDiagnostic, 2);
emitter.Emit(0, TestDiagnostic, 3);
emitter.Emit(4, TestDiagnostic, 4);
emitter.Emit(3, TestDiagnostic, 5);
emitter.Emit(3, TestDiagnostic, 6);
InSequence s;
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M2")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M3")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M1")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M5")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M6")));
EXPECT_CALL(consumer, HandleDiagnostic(IsSingleDiagnostic(
Kind::TestDiagnostic, Level::Error, _, _, "M4")));
sorting_consumer.Flush();
}
} // namespace
} // namespace Carbon::Diagnostics