mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 09:38:31 +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
67 lines
2.5 KiB
C++
67 lines
2.5 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/check/context.h"
|
|
#include "toolchain/check/convert.h"
|
|
#include "toolchain/check/handle.h"
|
|
#include "toolchain/check/keyword_modifier_set.h"
|
|
#include "toolchain/check/modifiers.h"
|
|
#include "toolchain/diagnostics/diagnostic.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleParseNode(Context& context,
|
|
Parse::MatchFirstIntroducerId /*node_id*/) -> bool {
|
|
// Optional modifiers follow.
|
|
context.decl_introducer_state_stack().Push<Lex::TokenKind::MatchFirst>();
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context,
|
|
Parse::MatchFirstDefinitionStartId node_id) -> bool {
|
|
auto enclosing_scope_inst_id = context.scope_stack().PeekInstId();
|
|
if (context.match_first_context() ||
|
|
!context.insts()
|
|
.IsOneOf<SemIR::ClassDecl, SemIR::FunctionDecl, SemIR::Namespace>(
|
|
enclosing_scope_inst_id)) {
|
|
CARBON_DIAGNOSTIC(
|
|
MatchFirstInWrongScope, Error,
|
|
"found `match_first` in invalid scope; expected namespace or class");
|
|
auto builder = context.emitter().Build(node_id, MatchFirstInWrongScope);
|
|
CARBON_DIAGNOSTIC_LABEL(MatchFirstInWrongScopeNote, Info,
|
|
"in enclosing scope here");
|
|
builder.Attach(enclosing_scope_inst_id, MatchFirstInWrongScopeNote);
|
|
builder.Emit();
|
|
context.node_stack().Push(node_id, SemIR::ErrorInst::InstId);
|
|
return true;
|
|
}
|
|
|
|
const auto& introducer = context.decl_introducer_state_stack().innermost();
|
|
bool is_final = introducer.modifier_set.HasAnyOf(KeywordModifierSet::Final);
|
|
|
|
auto decl_id = AddInst<SemIR::MatchFirstDecl>(
|
|
context, node_id, {.enclosing_scope_inst_id = enclosing_scope_inst_id});
|
|
context.match_first_context() = {.decl_id = decl_id, .is_final = is_final};
|
|
context.node_stack().Push(node_id, decl_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::MatchFirstId /*node_id*/)
|
|
-> bool {
|
|
auto decl_id =
|
|
context.node_stack().Pop<Parse::NodeKind::MatchFirstDefinitionStart>();
|
|
if (decl_id != SemIR::ErrorInst::InstId) {
|
|
context.match_first_context() = std::nullopt;
|
|
}
|
|
|
|
auto introducer =
|
|
context.decl_introducer_state_stack().Pop<Lex::TokenKind::MatchFirst>();
|
|
// Diagnose modifiers that are not allowed.
|
|
LimitModifiersOnDecl(context, introducer, KeywordModifierSet::MatchFirst);
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|