carbon-language/carbon-lang
1
0 Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-11-15 20:28:12 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Render diagnostics through the terminal library (#7683)

Browse Source 
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
This commit is contained in:
Chandler Carruth authored and GitHub committed 2026-10-15 06:08:57 +00:00
1 parent e1c8c1f855
commit 2c9739799b
1205 files changed
+20291 -24988
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

toolchain/parse/testdata/array/fail_syntax.carbon
Vendored
+22 -64
View File
@@ -10,116 +10,74 @@
// --- fail_no_comma.carbon
// CHECK:STDERR: fail_no_comma.carbon:[[@LINE+8]]:17: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR: var x: array(i32);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_comma.carbon:[[@LINE+4]]:17: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR:
// CHECK:STDERR: fail_no_comma.carbon:[[@LINE+4]]:17: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array(i32);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_comma.carbon:[[@LINE+2]]:17: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
var x: array(i32);
// --- fail_invalid_char.carbon
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+16]]:17: error: expected expression [ExpectedExpr]
// CHECK:STDERR: fn X() -> array(:);
// CHECK:STDERR: ^
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+12]]:17: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR: fn X() -> array(:);
// CHECK:STDERR: ^
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+8]]:17: error: expected expression [ExpectedExpr]
// CHECK:STDERR: fn X() -> array(:);
// CHECK:STDERR: ^
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+4]]:17: error: unexpected tokens before `)` [ExpectedCloseSymbol]
// CHECK:STDERR: fn X() -> array(:);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+6]]:17: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+4]]:17: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_char.carbon:[[@LINE+2]]:17: error: unexpected tokens before `)` [ExpectedCloseSymbol]
// CHECK:STDERR:
fn X() -> array(:);
// --- fail_unlexed_expr.carbon
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+12]]:14: error: encountered unrecognized characters while parsing [UnrecognizedCharacters]
// CHECK:STDERR: var y: array(`);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+6]]:14: error: encountered unrecognized characters while parsing [UnrecognizedCharacters]
// CHECK:STDERR:
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+8]]:14: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR: var y: array(`);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+4]]:14: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR:
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+4]]:14: error: unexpected tokens before `)` [ExpectedCloseSymbol]
// CHECK:STDERR: var y: array(`);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_unlexed_expr.carbon:[[@LINE+2]]:14: error: unexpected tokens before `)` [ExpectedCloseSymbol]
// CHECK:STDERR:
var y: array(`);
// --- fail_no_open_paren.carbon
// CHECK:STDERR: fail_no_open_paren.carbon:[[@LINE+4]]:14: error: expected `(` after `array` [ExpectedParenAfter]
// CHECK:STDERR: var x: array i32, 1;
// CHECK:STDERR: ^~~
// CHECK:STDERR: fail_no_open_paren.carbon:[[@LINE+2]]:14-16: error: expected `(` after `array` [ExpectedParenAfter]
// CHECK:STDERR:
var x: array i32, 1;
// --- fail_no_close_paren.carbon
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+11]]:13: error: opening symbol without a corresponding closing symbol [UnmatchedOpening]
// CHECK:STDERR: var x: array(i32,;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+8]]:18: note: possibly missing `)` here [PossiblyMissingBracketHere]
// CHECK:STDERR: var x: array(i32,;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+5]]:13: error: opening symbol without a corresponding closing symbol [UnmatchedOpening]
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+4]]:18: note: possibly missing `)` here [PossiblyMissingBracketHere]
// CHECK:STDERR:
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+4]]:18: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array(i32,;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_close_paren.carbon:[[@LINE+2]]:18: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
var x: array(i32,;
// --- fail_no_length.carbon
// CHECK:STDERR: fail_no_length.carbon:[[@LINE+4]]:18: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array(i32,);
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_length.carbon:[[@LINE+2]]:18: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
var x: array(i32,);
// --- fail_no_params.carbon
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+12]]:14: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array();
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+6]]:14: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+8]]:14: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR: var x: array();
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+4]]:14: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR:
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+4]]:14: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array();
// CHECK:STDERR: ^
// CHECK:STDERR: fail_no_params.carbon:[[@LINE+2]]:14: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
var x: array();
// --- fail_keyword_alone.carbon
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+16]]:13: error: expected `(` after `array` [ExpectedParenAfter]
// CHECK:STDERR: var x: array;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+8]]:13: error: expected `(` after `array` [ExpectedParenAfter]
// CHECK:STDERR:
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+12]]:13: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+6]]:13: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+8]]:13: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR: var x: array;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+4]]:13: error: expected `,` in `array(Type, Count)` [ExpectedArrayComma]
// CHECK:STDERR:
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+4]]:13: error: expected expression [ExpectedExpr]
// CHECK:STDERR: var x: array;
// CHECK:STDERR: ^
// CHECK:STDERR: fail_keyword_alone.carbon:[[@LINE+2]]:13: error: expected expression [ExpectedExpr]
// CHECK:STDERR:
var x: array;