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
91 lines
4.2 KiB
Plaintext
91 lines
4.2 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/operators/modifier.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/operators/modifier.carbon
|
|
|
|
// --- valid.carbon
|
|
|
|
fn F() {
|
|
a unsafe as b;
|
|
}
|
|
|
|
// --- fail_invalid.carbon
|
|
|
|
fn G() {
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+2]]:5-10: error: `unsafe` not allowed on operator `or` [ModifierNotAllowedOnOperator]
|
|
// CHECK:STDERR:
|
|
a unsafe or b;
|
|
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+2]]:5-10: error: `unsafe` not allowed on operator `*` [ModifierNotAllowedOnOperator]
|
|
// CHECK:STDERR:
|
|
a unsafe * b;
|
|
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+2]]:5-10: error: expected `;` after expression statement [ExpectedExprSemi]
|
|
// CHECK:STDERR:
|
|
a unsafe;
|
|
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+2]]:3-8: error: expected expression [ExpectedExpr]
|
|
// CHECK:STDERR:
|
|
unsafe;
|
|
|
|
// TODO: It'd be nice to underline both tokens in `unsafe as` here.
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+4]]:9-14: error: parentheses are required to disambiguate operator precedence [OperatorRequiresParentheses]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_invalid.carbon:[[@LINE+2]]:21: error: parentheses are required to disambiguate operator precedence [OperatorRequiresParentheses]
|
|
// CHECK:STDERR:
|
|
a + b unsafe as c * d;
|
|
}
|
|
|
|
// CHECK:STDOUT: - filename: valid.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'a'
|
|
// CHECK:STDOUT: │ │ ╭─UnsafeModifier 'unsafe'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'b'
|
|
// CHECK:STDOUT: │ │ ╭─InfixOperatorAs 'as'
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_invalid.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'G'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'a'
|
|
// CHECK:STDOUT: │ │ ╭─ShortCircuitOperandOr 'or' has_error
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'b'
|
|
// CHECK:STDOUT: │ │ ╭─ShortCircuitOperatorOr 'or' has_error
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'a'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'b'
|
|
// CHECK:STDOUT: │ │ ╭─InfixOperatorStar '*' has_error
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'a'
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';' has_error
|
|
// CHECK:STDOUT: │ │ ╭─InvalidParse 'unsafe' has_error
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';' has_error
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'a'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'b'
|
|
// CHECK:STDOUT: │ │ ╭─InfixOperatorPlus '+'
|
|
// CHECK:STDOUT: │ │ ╭─UnsafeModifier 'unsafe' has_error
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'c'
|
|
// CHECK:STDOUT: │ │ ╭─InfixOperatorAs 'as' has_error
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'd'
|
|
// CHECK:STDOUT: │ │ ╭─InfixOperatorStar '*' has_error
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|