mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 03:18:11 +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
115 lines
4.6 KiB
Plaintext
115 lines
4.6 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/class/friend.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/class/friend.carbon
|
|
|
|
// --- friend.carbon
|
|
|
|
class Foo {
|
|
friend Bar;
|
|
}
|
|
|
|
// --- fail_todo_qualified.carbon
|
|
|
|
class Baz {
|
|
// CHECK:STDERR: fail_todo_qualified.carbon:[[@LINE+2]]:11: error: `friend` declarations must end with a `;` [ExpectedDeclSemi]
|
|
// CHECK:STDERR:
|
|
friend P.Q;
|
|
}
|
|
|
|
// --- fail_bad_syntax.carbon
|
|
|
|
class A {
|
|
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:9: error: expected identifier for friend declaration [ExpectedIdentifierForFriend]
|
|
// CHECK:STDERR:
|
|
friend;
|
|
}
|
|
|
|
class B {
|
|
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:12-22: error: `friend` declarations must end with a `;` [ExpectedDeclSemi]
|
|
// CHECK:STDERR:
|
|
friend X extra_token;
|
|
}
|
|
|
|
class C {
|
|
friend
|
|
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:1: error: expected identifier for friend declaration [ExpectedIdentifierForFriend]
|
|
// CHECK:STDERR:
|
|
}
|
|
|
|
class D {
|
|
friend X
|
|
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:1: error: `friend` declarations must end with a `;` [ExpectedDeclSemi]
|
|
// CHECK:STDERR:
|
|
}
|
|
|
|
class E {
|
|
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:10-14: error: expected identifier for friend declaration [ExpectedIdentifierForFriend]
|
|
// CHECK:STDERR:
|
|
friend class;
|
|
}
|
|
|
|
// CHECK:STDOUT: - filename: friend.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'Bar'
|
|
// CHECK:STDOUT: │ ├─FriendDecl ';'
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_todo_qualified.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Baz'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'P'
|
|
// CHECK:STDOUT: │ ├─FriendDecl ';' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_bad_syntax.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'A'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ ├─FriendDecl ';' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'B'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'X'
|
|
// CHECK:STDOUT: │ ├─FriendDecl ';' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'C'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ ├─FriendDecl 'friend' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'D'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'X'
|
|
// CHECK:STDOUT: │ ├─FriendDecl 'X' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'E'
|
|
// CHECK:STDOUT: │ ╭─ClassDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FriendIntroducer 'friend'
|
|
// CHECK:STDOUT: │ ├─FriendDecl ';' has_error
|
|
// CHECK:STDOUT: ├─ClassDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|