carbon-language/carbon-lang
1
0 Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-11-15 12:58:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity
Files
3af25cc1ba9c8b5ed1b4a2d779e71f2b86f11721
carbon-lang/toolchain/parse/testdata/packages/import/cpp_inline.carbon
T
Chandler Carruth 2c9739799b Render diagnostics through the terminal library (#7683) 
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
2026-10-15 06:08:57 +00:00

215 lines
8.5 KiB
Plaintext
Raw Blame History

// 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/import/cpp_inline.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/packages/import/cpp_inline.carbon
// --- fail_bad_syntax.carbon
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:18: error: expected string literal after `inline` [ExpectedStringAfterInline]
// CHECK:STDERR:
import Cpp inline;
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:19-25: error: expected string literal after `inline` [ExpectedStringAfterInline]
// CHECK:STDERR:
import Cpp inline library "foo.h";
// TODO: We might want to allow this as a "preprocessed source" syntax.
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:28-33: error: `import` declarations must end with a `;` [ExpectedDeclSemi]
// CHECK:STDERR:
import Cpp library "foo.h" inline "bar";
// CHECK:STDERR: fail_bad_syntax.carbon:[[@LINE+2]]:24-29: error: `import` declarations must end with a `;` [ExpectedDeclSemi]
// CHECK:STDERR:
import library "foo.h" inline "bar";
// --- fail_no_semi_at_eof.carbon
import Cpp inline
// CHECK:STDERR: fail_no_semi_at_eof.carbon:[[@LINE+2]]:1: error: expected string literal after `inline` [ExpectedStringAfterInline]
// CHECK:STDERR:
// --- fail_package_inline.carbon
// CHECK:STDERR: fail_package_inline.carbon:[[@LINE+2]]:16-21: error: `package` declarations must end with a `;` [ExpectedDeclSemi]
// CHECK:STDERR:
package NotCpp inline "int n;";
// --- fail_library_inline.carbon
// CHECK:STDERR: fail_library_inline.carbon:[[@LINE+2]]:17-22: error: `library` declarations must end with a `;` [ExpectedDeclSemi]
// CHECK:STDERR:
library "foo.h" inline "int n;";
// --- wrong_package.carbon
// We reject this in check.
import NotCpp inline "bar";
// --- valid_syntax.carbon
import Cpp inline "int m;";
import Cpp inline '''
// C++ comment.
int n;
''';
// --- inline_cpp.carbon
inline Cpp '''
int n;
''';
// --- fail_inline_cpp_syntax_errors.carbon
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:7: error: expected `Cpp` after `inline` [ExpectedCppAfterInline]
// CHECK:STDERR:
inline;
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:8-21: error: expected `Cpp` after `inline` [ExpectedCppAfterInline]
// CHECK:STDERR:
inline '''
int n;
''';
// Recovery skips to the `;` even when tokens follow the closing `'''` on its
// line, so the `;` ends the declaration rather than starting an empty one.
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:8-21: error: expected `Cpp` after `inline` [ExpectedCppAfterInline]
// CHECK:STDERR:
inline '''
int n;
''' + "more";
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:11: error: expected string literal after `inline Cpp` [ExpectedStringAfterInlineCpp]
// CHECK:STDERR:
inline Cpp;
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:12: error: expected string literal after `inline Cpp` [ExpectedStringAfterInlineCpp]
// CHECK:STDERR:
inline Cpp x;
inline Cpp '''
int n;
'''
// CHECK:STDERR: fail_inline_cpp_syntax_errors.carbon:[[@LINE+2]]:1: error: `inline` declarations must end with a `;` [ExpectedDeclSemi]
// CHECK:STDERR:
// --- eof.carbon
// This split exists to avoid the "no `;` at EOF" diagnostic above pointing to
// the last CHECK:STDOUT line below.
// CHECK:STDOUT: - filename: fail_bad_syntax.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody ';' has_error
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl ';' has_error
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody 'library' has_error
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl ';' has_error
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─LibraryName '"foo.h"'
// CHECK:STDOUT: │ ├─LibrarySpecifier 'library'
// CHECK:STDOUT: ├─ImportDecl ';' has_error
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ │ ╭─LibraryName '"foo.h"'
// CHECK:STDOUT: │ ├─LibrarySpecifier 'library'
// CHECK:STDOUT: ├─ImportDecl ';' has_error
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: fail_no_semi_at_eof.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody '' has_error
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl 'inline' has_error
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: fail_package_inline.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─PackageIntroducer 'package'
// CHECK:STDOUT: │ ├─IdentifierPackageName 'NotCpp'
// CHECK:STDOUT: ├─PackageDecl ';' has_error
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: fail_library_inline.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─LibraryIntroducer 'library'
// CHECK:STDOUT: │ ├─LibraryName '"foo.h"'
// CHECK:STDOUT: ├─LibraryDecl ';' has_error
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: wrong_package.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─IdentifierPackageName 'NotCpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody '"bar"'
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl ';'
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: valid_syntax.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody '"int m;"'
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl ';'
// CHECK:STDOUT: │ ╭─ImportIntroducer 'import'
// CHECK:STDOUT: │ ├─CppPackageName 'Cpp'
// CHECK:STDOUT: │ │ ╭─InlineImportBody ''''
// CHECK:STDOUT: // C++ comment.
// CHECK:STDOUT: int n;
// CHECK:STDOUT: ''''
// CHECK:STDOUT: │ ├─InlineImportSpecifier 'inline'
// CHECK:STDOUT: ├─ImportDecl ';'
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: inline_cpp.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: │ ├─CppNameExpr 'Cpp'
// CHECK:STDOUT: │ ├─InlineImportBody ''''
// CHECK:STDOUT: int n;
// CHECK:STDOUT: ''''
// CHECK:STDOUT: ├─InlineCppDecl ';'
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: fail_inline_cpp_syntax_errors.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: ├─InlineCppDecl ';' has_error
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: ├─InlineCppDecl ';' has_error
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: ├─InlineCppDecl ';' has_error
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: │ ├─CppNameExpr 'Cpp'
// CHECK:STDOUT: ├─InlineCppDecl ';' has_error
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: │ ├─CppNameExpr 'Cpp'
// CHECK:STDOUT: ├─InlineCppDecl ';' has_error
// CHECK:STDOUT: │ ╭─InlineIntroducer 'inline'
// CHECK:STDOUT: │ ├─CppNameExpr 'Cpp'
// CHECK:STDOUT: │ ├─InlineImportBody ''''
// CHECK:STDOUT: int n;
// CHECK:STDOUT: ''''
// CHECK:STDOUT: ├─InlineCppDecl ''''
// CHECK:STDOUT: int n;
// CHECK:STDOUT: '''' has_error
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
// CHECK:STDOUT: - filename: eof.carbon
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)
Reference in new issue View Git Blame Copy Permalink