mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 08:38:30 +00:00
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
124 lines
5.8 KiB
Plaintext
124 lines
5.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
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/generics/impl/match_first.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/generics/impl/match_first.carbon
|
|
|
|
// --- empty.carbon
|
|
|
|
match_first {}
|
|
|
|
// --- fail_missing_braces.carbon
|
|
|
|
// CHECK:STDERR: fail_missing_braces.carbon:[[@LINE+2]]:12: error: expected `{` after `match_first` [ExpectedCurlyBraceAfter]
|
|
// CHECK:STDERR:
|
|
match_first;
|
|
|
|
// --- fail_eof.carbon
|
|
|
|
match_first
|
|
// CHECK:STDERR: fail_eof.carbon:[[@LINE+2]]:1: error: expected `{` after `match_first` [ExpectedCurlyBraceAfter]
|
|
// CHECK:STDERR:
|
|
|
|
// --- with_impls.carbon
|
|
|
|
match_first {
|
|
|
|
impl forall [T: I] T as Interface {
|
|
fn Add(self, b: Self) -> Self;
|
|
}
|
|
|
|
impl forall [T: J] T as Interface {
|
|
fn Add(self, b: Self) -> Self;
|
|
}
|
|
|
|
}
|
|
|
|
// CHECK:STDOUT: - filename: empty.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─MatchFirstIntroducer 'match_first'
|
|
// CHECK:STDOUT: │ ╭─MatchFirstDefinitionStart '{'
|
|
// CHECK:STDOUT: ├─MatchFirst '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_missing_braces.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─MatchFirstIntroducer 'match_first'
|
|
// CHECK:STDOUT: │ ╭─MatchFirstDefinitionStart 'match_first' has_error
|
|
// CHECK:STDOUT: ├─MatchFirst 'match_first' has_error
|
|
// CHECK:STDOUT: ├─EmptyDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_eof.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─MatchFirstIntroducer 'match_first'
|
|
// CHECK:STDOUT: │ ╭─MatchFirstDefinitionStart 'match_first' has_error
|
|
// CHECK:STDOUT: ├─MatchFirst 'match_first' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: with_impls.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─MatchFirstIntroducer 'match_first'
|
|
// CHECK:STDOUT: │ ╭─MatchFirstDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─ImplIntroducer 'impl'
|
|
// CHECK:STDOUT: │ │ ├─Forall 'forall'
|
|
// CHECK:STDOUT: │ │ │ ╭─ImplicitParamListStart '['
|
|
// CHECK:STDOUT: │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'T'
|
|
// CHECK:STDOUT: │ │ │ │ ├─CompileTimeBindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ │ ├─IdentifierNameExpr 'I'
|
|
// CHECK:STDOUT: │ │ │ ├─CompileTimeBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ ├─ImplicitParamList ']'
|
|
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'T'
|
|
// CHECK:STDOUT: │ │ ├─ImplTypeAs 'as'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'Interface'
|
|
// CHECK:STDOUT: │ │ ╭─ImplDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ │ │ ├─IdentifierNameMaybeBeforeSignature 'Add'
|
|
// CHECK:STDOUT: │ │ │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ │ │ │ │ ╭─SelfValueName 'self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─SelfBindingPattern 'self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─PatternListComma ','
|
|
// CHECK:STDOUT: │ │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'b'
|
|
// CHECK:STDOUT: │ │ │ │ │ ├─BindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ │ │ ├─SelfTypeNameExpr 'Self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─LetBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ │ │ │ ╭─SelfTypeNameExpr 'Self'
|
|
// CHECK:STDOUT: │ │ │ ├─ReturnType '->'
|
|
// CHECK:STDOUT: │ │ ├─FunctionDecl ';'
|
|
// CHECK:STDOUT: │ ├─ImplDefinition '}'
|
|
// CHECK:STDOUT: │ │ ╭─ImplIntroducer 'impl'
|
|
// CHECK:STDOUT: │ │ ├─Forall 'forall'
|
|
// CHECK:STDOUT: │ │ │ ╭─ImplicitParamListStart '['
|
|
// CHECK:STDOUT: │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'T'
|
|
// CHECK:STDOUT: │ │ │ │ ├─CompileTimeBindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ │ ├─IdentifierNameExpr 'J'
|
|
// CHECK:STDOUT: │ │ │ ├─CompileTimeBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ ├─ImplicitParamList ']'
|
|
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'T'
|
|
// CHECK:STDOUT: │ │ ├─ImplTypeAs 'as'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'Interface'
|
|
// CHECK:STDOUT: │ │ ╭─ImplDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ │ │ ├─IdentifierNameMaybeBeforeSignature 'Add'
|
|
// CHECK:STDOUT: │ │ │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ │ │ │ │ ╭─SelfValueName 'self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─SelfBindingPattern 'self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─PatternListComma ','
|
|
// CHECK:STDOUT: │ │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'b'
|
|
// CHECK:STDOUT: │ │ │ │ │ ├─BindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ │ │ ├─SelfTypeNameExpr 'Self'
|
|
// CHECK:STDOUT: │ │ │ │ ├─LetBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ │ │ │ ╭─SelfTypeNameExpr 'Self'
|
|
// CHECK:STDOUT: │ │ │ ├─ReturnType '->'
|
|
// CHECK:STDOUT: │ │ ├─FunctionDecl ';'
|
|
// CHECK:STDOUT: │ ├─ImplDefinition '}'
|
|
// CHECK:STDOUT: ├─MatchFirst '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|