mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-18 02:50:32 +00:00
Render diagnostics through the terminal library (#7683)
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
This commit is contained in:
1 parent
e1c8c1f855
commit
2c9739799b
1205 files changed
+20291
-24988
No files matched your search
@@ -257,9 +257,9 @@ static auto DiagnoseNonFinalImplsWithSameTypeStructureOutsideMatchFirst(
|
||||
"structure as another non-final `impl`");
|
||||
auto builder = context.emitter().Build(impl_b.latest_decl_id,
|
||||
ImplNonFinalSameTypeStructure);
|
||||
CARBON_DIAGNOSTIC(ImplNonFinalSameTypeStructureNote, Note,
|
||||
"other `impl` here");
|
||||
builder.Note(impl_a.latest_decl_id, ImplNonFinalSameTypeStructureNote);
|
||||
CARBON_DIAGNOSTIC_LABEL(ImplNonFinalSameTypeStructureNote, Info,
|
||||
"other `impl` here");
|
||||
builder.Attach(impl_a.latest_decl_id, ImplNonFinalSameTypeStructureNote);
|
||||
builder.Emit();
|
||||
return true;
|
||||
}
|
||||
@@ -285,10 +285,10 @@ static auto DiagnoseUnmatchableNonFinalImplWithFinalImpl(Context& context,
|
||||
"`impl` will never be used");
|
||||
auto builder = context.emitter().Build(query_impl.latest_decl_id,
|
||||
ImplFinalOverlapsNonFinal);
|
||||
CARBON_DIAGNOSTIC(
|
||||
ImplFinalOverlapsNonFinalNote, Note,
|
||||
CARBON_DIAGNOSTIC_LABEL(
|
||||
ImplFinalOverlapsNonFinalNote, Info,
|
||||
"`final impl` declared here would always be used instead");
|
||||
builder.Note(final_impl.latest_decl_id, ImplFinalOverlapsNonFinalNote);
|
||||
builder.Attach(final_impl.latest_decl_id, ImplFinalOverlapsNonFinalNote);
|
||||
builder.Emit();
|
||||
return true;
|
||||
}
|
||||
@@ -316,17 +316,17 @@ static auto DiagnoseFinalImplsOverlapInDifferentFiles(Context& context,
|
||||
CARBON_DIAGNOSTIC(
|
||||
FinalImplOverlapsDifferentFile, Error,
|
||||
"`final impl` overlaps with `final impl` from another file");
|
||||
CARBON_DIAGNOSTIC(FinalImplOverlapsDifferentFileNote, Note,
|
||||
"imported `final impl` here");
|
||||
CARBON_DIAGNOSTIC_LABEL(FinalImplOverlapsDifferentFileNote, Info,
|
||||
"imported `final impl` here");
|
||||
if (impl_a.is_local) {
|
||||
auto builder = context.emitter().Build(impl_a.latest_decl_id,
|
||||
FinalImplOverlapsDifferentFile);
|
||||
builder.Note(impl_b.latest_decl_id, FinalImplOverlapsDifferentFileNote);
|
||||
builder.Attach(impl_b.latest_decl_id, FinalImplOverlapsDifferentFileNote);
|
||||
builder.Emit();
|
||||
} else {
|
||||
auto builder = context.emitter().Build(impl_b.latest_decl_id,
|
||||
FinalImplOverlapsDifferentFile);
|
||||
builder.Note(impl_a.latest_decl_id, FinalImplOverlapsDifferentFileNote);
|
||||
builder.Attach(impl_a.latest_decl_id, FinalImplOverlapsDifferentFileNote);
|
||||
builder.Emit();
|
||||
}
|
||||
return true;
|
||||
@@ -351,9 +351,9 @@ static auto DiagnoseFinalImplsOverlapOutsideMatchFirst(Context& context,
|
||||
"outside a `match_first` block");
|
||||
auto builder = context.emitter().Build(impl_b.latest_decl_id,
|
||||
FinalImplOverlapsSameFile);
|
||||
CARBON_DIAGNOSTIC(FinalImplOverlapsSameFileNote, Note,
|
||||
"other `final impl` here");
|
||||
builder.Note(impl_a.latest_decl_id, FinalImplOverlapsSameFileNote);
|
||||
CARBON_DIAGNOSTIC_LABEL(FinalImplOverlapsSameFileNote, Info,
|
||||
"other `final impl` here");
|
||||
builder.Attach(impl_a.latest_decl_id, FinalImplOverlapsSameFileNote);
|
||||
builder.Emit();
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user