mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-14 23:18:47 +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
251 lines
11 KiB
Plaintext
251 lines
11 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/function/definition.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/function/definition.carbon
|
|
|
|
// --- basic.carbon
|
|
|
|
fn F() {}
|
|
|
|
// --- with_params.carbon
|
|
|
|
fn foo(bar: i64, baz: i64) {
|
|
foo(baz, bar + baz);
|
|
}
|
|
|
|
// --- with_positional_params.carbon
|
|
|
|
fn foo {
|
|
foo($0, $42.0 + $86);
|
|
}
|
|
|
|
// --- with_return_type.carbon
|
|
|
|
fn foo() -> f64 {
|
|
return 42;
|
|
}
|
|
|
|
// --- fail_identifier_in_statements.carbon
|
|
|
|
fn F() {
|
|
// Note: this might become valid depending on the expression syntax. This test
|
|
// shouldn't be taken as a sign it should remain invalid.
|
|
bar
|
|
// CHECK:STDERR: fail_identifier_in_statements.carbon:[[@LINE+2]]:1: error: expected `;` after expression statement [ExpectedExprSemi]
|
|
// CHECK:STDERR:
|
|
}
|
|
|
|
// --- nested.carbon
|
|
|
|
fn F() {
|
|
fn NamedParams(a: i32) {}
|
|
fn PositionalParams {}
|
|
}
|
|
|
|
// --- builtin.carbon
|
|
|
|
fn F() = "builtin";
|
|
|
|
// --- builtin_nested.carbon
|
|
|
|
impl T as I {
|
|
fn Op() = "builtin";
|
|
}
|
|
|
|
// --- fail_builtin_identifier.carbon
|
|
|
|
// CHECK:STDERR: fail_builtin_identifier.carbon:[[@LINE+2]]:18-23: error: expected builtin function name after `=` [ExpectedBuiltinName]
|
|
// CHECK:STDERR:
|
|
fn NotString() = banana;
|
|
|
|
// --- fail_builtin_two_strings.carbon
|
|
|
|
// CHECK:STDERR: fail_builtin_two_strings.carbon:[[@LINE+2]]:32-38: error: `fn` declarations must end with a `;` [ExpectedDeclSemi]
|
|
// CHECK:STDERR:
|
|
fn JunkAfterString() = "hello" "world";
|
|
|
|
// --- fail_builtin_spurious_equals.carbon
|
|
|
|
// CHECK:STDERR: fail_builtin_spurious_equals.carbon:[[@LINE+2]]:23: error: expected builtin function name after `=` [ExpectedBuiltinName]
|
|
// CHECK:STDERR:
|
|
fn SpuriousEquals() = { }
|
|
fn TestRecoveryFromSpuriousEquals();
|
|
|
|
// CHECK:STDOUT: - filename: basic.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: with_params.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'foo'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'bar'
|
|
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ ├─IntTypeLiteral 'i64'
|
|
// CHECK:STDOUT: │ │ ├─LetBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ ├─PatternListComma ','
|
|
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'baz'
|
|
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ ├─IntTypeLiteral 'i64'
|
|
// CHECK:STDOUT: │ │ ├─LetBindingPattern ':'
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'foo'
|
|
// CHECK:STDOUT: │ │ ╭─CallExprStart '('
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'baz'
|
|
// CHECK:STDOUT: │ │ ├─TupleLiteralComma ','
|
|
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'bar'
|
|
// CHECK:STDOUT: │ │ │ ├─IdentifierNameExpr 'baz'
|
|
// CHECK:STDOUT: │ │ ├─InfixOperatorPlus '+'
|
|
// CHECK:STDOUT: │ │ ╭─CallExpr ')'
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: with_positional_params.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'foo'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'foo'
|
|
// CHECK:STDOUT: │ │ ╭─CallExprStart '('
|
|
// CHECK:STDOUT: │ │ ├─PositionalParamExpr '$0'
|
|
// CHECK:STDOUT: │ │ ├─TupleLiteralComma ','
|
|
// CHECK:STDOUT: │ │ │ ╭─PositionalParamExpr '$42'
|
|
// CHECK:STDOUT: │ │ │ ├─IntLiteral '0'
|
|
// CHECK:STDOUT: │ │ │ ╭─MemberAccessExpr '.'
|
|
// CHECK:STDOUT: │ │ │ ├─PositionalParamExpr '$86'
|
|
// CHECK:STDOUT: │ │ ├─InfixOperatorPlus '+'
|
|
// CHECK:STDOUT: │ │ ╭─CallExpr ')'
|
|
// CHECK:STDOUT: │ ├─ExprStatement ';'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: with_return_type.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'foo'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ │ ╭─FloatTypeLiteral 'f64'
|
|
// CHECK:STDOUT: │ ├─ReturnType '->'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─ReturnStatementStart 'return'
|
|
// CHECK:STDOUT: │ │ ├─IntLiteral '42'
|
|
// CHECK:STDOUT: │ ├─ReturnStatement ';'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_identifier_in_statements.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'bar'
|
|
// CHECK:STDOUT: │ ├─ExprStatement 'bar' has_error
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: nested.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameMaybeBeforeSignature 'NamedParams'
|
|
// CHECK:STDOUT: │ │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'a'
|
|
// CHECK:STDOUT: │ │ │ │ ├─BindingPatternTypeStart ':'
|
|
// CHECK:STDOUT: │ │ │ │ ├─IntTypeLiteral 'i32'
|
|
// CHECK:STDOUT: │ │ │ ├─LetBindingPattern ':'
|
|
// CHECK:STDOUT: │ │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: │ │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameNotBeforeSignature 'PositionalParams'
|
|
// CHECK:STDOUT: │ │ ╭─FunctionDefinitionStart '{'
|
|
// CHECK:STDOUT: │ ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FunctionDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: builtin.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─BuiltinFunctionDefinitionStart '='
|
|
// CHECK:STDOUT: │ ├─BuiltinName '"builtin"'
|
|
// CHECK:STDOUT: ├─BuiltinFunctionDefinition ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: builtin_nested.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'T'
|
|
// CHECK:STDOUT: │ ├─ImplTypeAs 'as'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameExpr 'I'
|
|
// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{'
|
|
// CHECK:STDOUT: │ │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ │ ├─IdentifierNameMaybeBeforeSignature 'Op'
|
|
// CHECK:STDOUT: │ │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ │ ╭─BuiltinFunctionDefinitionStart '='
|
|
// CHECK:STDOUT: │ │ ├─BuiltinName '"builtin"'
|
|
// CHECK:STDOUT: │ ├─BuiltinFunctionDefinition ';'
|
|
// CHECK:STDOUT: ├─ImplDefinition '}'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_builtin_identifier.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'NotString'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─BuiltinFunctionDefinitionStart '='
|
|
// CHECK:STDOUT: ├─BuiltinFunctionDefinition ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_builtin_two_strings.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'JunkAfterString'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─BuiltinFunctionDefinitionStart '='
|
|
// CHECK:STDOUT: │ ├─BuiltinName '"hello"'
|
|
// CHECK:STDOUT: ├─BuiltinFunctionDefinition ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_builtin_spurious_equals.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'SpuriousEquals'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: │ ╭─BuiltinFunctionDefinitionStart '='
|
|
// CHECK:STDOUT: ├─BuiltinFunctionDefinition '}' has_error
|
|
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'TestRecoveryFromSpuriousEquals'
|
|
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
|
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
|
// CHECK:STDOUT: ├─FunctionDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|