mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 17:28:10 +00:00
Chandler Carruth
2c9739799b
Diagnostic rendering was part of the data model: `Loc::FormatLocation` and `Loc::FormatSnippet` wrote plain text to a stream, so no capability, color, or terminal width could reach them. A diagnostic is now one message with labels, contexts, and location information attached, and `Diagnostics::Renderer` draws it into a `Terminal::Buffer`. The design is in `toolchain/docs/diagnostics_rendering.md` (#7668), authoring in `toolchain/docs/diagnostics.md`. Before: ``` example.carbon:6:3: error: 1 argument passed to function expecting 0 arguments Run0(1); ^~~~~~~ example.carbon:3:1: note: calling function declared here fn Run0() {} ^~~~~~~~~~~ ``` After: ``` error: 1 argument passed to function expecting 0 arguments ╭─┤ example.carbon:6:3 ┆ 3 │ fn Run0() {} · ─────┬───── · ╰──┤ calling function declared here ┆ -> 6 │ Run0(1); · ─────── ╰──────────── ``` `--no-diagnostic-snippets` gives a compact form, `example.carbon:6:3-9`. File tests use it; the rendering tests under `toolchain/diagnostics/testdata` ask for snippets. C++ interop diagnostics are data now rather than text Clang drew: `SemIR::ClangSourceLocId` names a `clang::SourceRange`, and a Clang location is marked as the point it names. `StreamConsumer` moves to a `:renderer` target that `:emitter` does not depend on, keeping `common/terminal` out of `consumer.h`. Capabilities come from the file behind the error stream, so tests get plain ASCII. `renderer_fuzzer` draws diagnostics built from fuzzer bytes with every capability combination, since a shape the renderer doesn't expect must never be why the compiler dies while reporting a problem. TODOs mark the follow-ups: line weights and crossing lines, wrapping that keeps a quoted type whole, and ordering diagnostics that share a byte offset. Also: `IncorrectExtension`'s hint moves into its message, since its note had no location of its own, and `strip_noise` in `check_diagnostics.py` blanks multi-line `#define`s instead of deleting them. Assisted-by: Claude Code
79 lines
1.8 KiB
Plaintext
79 lines
1.8 KiB
Plaintext
// 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-FILE: toolchain/testing/testdata/min_prelude/destroy.carbon
|
|
// EXTRA-ARGS: --share-cpp-ast
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/interop/cpp/class/export/override.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/class/export/override.carbon
|
|
|
|
// --- const_ref_param.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import Cpp;
|
|
|
|
inline Cpp '''
|
|
struct X {};
|
|
|
|
struct A {
|
|
virtual void f(const X& x) = 0;
|
|
};
|
|
''';
|
|
|
|
class B {
|
|
extend base: Cpp.A;
|
|
override fn f(unused self, unused x: Cpp.X) {}
|
|
}
|
|
|
|
inline Cpp '''
|
|
Carbon::B b;
|
|
''';
|
|
|
|
// --- base.h
|
|
struct Base {
|
|
virtual ~Base();
|
|
virtual void F() = 0;
|
|
};
|
|
|
|
// --- derived.carbon
|
|
library "derived";
|
|
import Cpp library "base.h";
|
|
|
|
class Derived {
|
|
extend base: Cpp.Base;
|
|
override fn F(unused self) {}
|
|
}
|
|
|
|
// --- imported.carbon
|
|
library "imported";
|
|
import Cpp library "base.h";
|
|
import library "derived";
|
|
|
|
inline Cpp '''
|
|
void Test() {
|
|
Carbon::Derived d;
|
|
}
|
|
''';
|
|
|
|
// --- fail_todo_generic.carbon
|
|
// TODO: Test in `toolchain/lower/testdata/` once generic classes deriving from
|
|
// C++ virtual classes pass check.
|
|
library "[[@TEST_NAME]]";
|
|
import Cpp;
|
|
|
|
inline Cpp '''
|
|
struct VBase {
|
|
virtual void f() {}
|
|
};
|
|
''';
|
|
|
|
// CHECK:STDERR: fail_todo_generic.carbon:[[@LINE+2]]:1-25: error: semantics TODO: `generic class deriving from C++ virtual class` [SemanticsTodo]
|
|
// CHECK:STDERR:
|
|
class GenericZ(T: type) {
|
|
extend base: Cpp.VBase;
|
|
override fn f(unused self) {}
|
|
}
|