mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 21:18:09 +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
260 lines
9.6 KiB
Plaintext
260 lines
9.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/packages/export.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/packages/export.carbon
|
|
|
|
// --- lib.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// --- name.carbon
|
|
|
|
package Pkg;
|
|
|
|
export Foo;
|
|
|
|
// --- qual_name.carbon
|
|
|
|
package Pkg;
|
|
|
|
export Foo.Bar;
|
|
|
|
// --- fail_expr.carbon
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_expr.carbon:[[@LINE+2]]:8: error: `export` introducer should be followed by a name [ExpectedDeclName]
|
|
// CHECK:STDERR:
|
|
export ();
|
|
|
|
// --- fail_package_in_name.carbon
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_package_in_name.carbon:[[@LINE+2]]:8-14: error: `export` introducer should be followed by a name [ExpectedDeclName]
|
|
// CHECK:STDERR:
|
|
export package.Bar;
|
|
|
|
// --- fail_keyword_only
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_keyword_only:[[@LINE+2]]:1-6: error: `export` introducer should be followed by a name [ExpectedDeclName]
|
|
// CHECK:STDERR:
|
|
export
|
|
|
|
// --- fail_no_name.carbon
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_no_name.carbon:[[@LINE+2]]:8: error: `export` introducer should be followed by a name [ExpectedDeclName]
|
|
// CHECK:STDERR:
|
|
export ;
|
|
|
|
// --- fail_no_semi.carbon
|
|
|
|
package Pkg;
|
|
|
|
export Foo
|
|
// CHECK:STDERR: fail_no_semi.carbon:[[@LINE+2]]:1: error: `export` declarations must end with a `;` [ExpectedDeclSemi]
|
|
// CHECK:STDERR:
|
|
|
|
// --- fail_incomplete_qual_name.carbon
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_incomplete_qual_name.carbon:[[@LINE+2]]:12: error: `.` should be followed by a name [ExpectedDeclNameAfterPeriod]
|
|
// CHECK:STDERR:
|
|
export Foo.;
|
|
|
|
// --- fail_incomplete_qual_name2.carbon
|
|
|
|
package Pkg;
|
|
|
|
// CHECK:STDERR: fail_incomplete_qual_name2.carbon:[[@LINE+2]]:8: error: `export` introducer should be followed by a name [ExpectedDeclName]
|
|
// CHECK:STDERR:
|
|
export .Bar;
|
|
|
|
// --- after_decl.carbon
|
|
|
|
package Pkg;
|
|
|
|
class C;
|
|
|
|
export Foo;
|
|
|
|
// --- fail_before_import.carbon
|
|
|
|
package Pkg;
|
|
|
|
export Foo;
|
|
|
|
// CHECK:STDERR: fail_before_import.carbon:[[@LINE+3]]:1-6: error: `import` declarations must come after the `package` declaration (if present) and before any other entities in the file [ImportTooLate]
|
|
// CHECK:STDERR: fail_before_import.carbon:[[@LINE-3]]:1-6: note: first declaration is here [FirstDecl]
|
|
// CHECK:STDERR:
|
|
import library "lib";
|
|
|
|
// --- fail_in_default_library.carbon
|
|
|
|
// CHECK:STDERR: fail_in_default_library.carbon:[[@LINE+2]]:1-6: error: `export` is only allowed in API files [ExportFromImpl]
|
|
// CHECK:STDERR:
|
|
export Foo;
|
|
|
|
// --- fail_in_impl.carbon
|
|
|
|
impl package Pkg;
|
|
|
|
// CHECK:STDERR: fail_in_impl.carbon:[[@LINE+2]]:1-6: error: `export` is only allowed in API files [ExportFromImpl]
|
|
// CHECK:STDERR:
|
|
export Foo;
|
|
|
|
// CHECK:STDOUT: - filename: lib.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─LibraryIntroducer 'library'
|
|
// CHECK:STDOUT: │ ├─LibraryName '"lib"'
|
|
// CHECK:STDOUT: ├─LibraryDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: name.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: qual_name.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameQualifierWithoutParams '.'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Bar'
|
|
// CHECK:STDOUT: ├─ExportDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_expr.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─InvalidParse '(' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_package_in_name.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─InvalidParse 'package' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_keyword_only
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─InvalidParse '' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl 'export' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_no_name.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─InvalidParse ';' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_no_semi.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl 'Foo' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_incomplete_qual_name.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ │ ╭─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameQualifierWithoutParams '.'
|
|
// CHECK:STDOUT: │ ├─InvalidParse ';' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_incomplete_qual_name2.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─InvalidParse '.' has_error
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: after_decl.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ClassIntroducer 'class'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'C'
|
|
// CHECK:STDOUT: ├─ClassDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl ';'
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_before_import.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
|
|
// CHECK:STDOUT: ├─ImportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_in_default_library.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|
|
// CHECK:STDOUT: - filename: fail_in_impl.carbon
|
|
// CHECK:STDOUT: ╭─FileStart ''
|
|
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
|
|
// CHECK:STDOUT: │ ├─ImplModifier 'impl'
|
|
// CHECK:STDOUT: │ ├─IdentifierPackageName 'Pkg'
|
|
// CHECK:STDOUT: ├─PackageDecl ';'
|
|
// CHECK:STDOUT: │ ╭─ExportIntroducer 'export'
|
|
// CHECK:STDOUT: │ ├─IdentifierNameNotBeforeSignature 'Foo'
|
|
// CHECK:STDOUT: ├─ExportDecl ';' has_error
|
|
// CHECK:STDOUT: ├─FileEnd ''
|
|
// CHECK:STDOUT: (root)
|