mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 15:30:34 +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
135 lines
6.0 KiB
Plaintext
135 lines
6.0 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/lex/testdata/dump_sem_ir_range.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/lex/testdata/dump_sem_ir_range.carbon
|
|
|
|
// --- full_file.carbon
|
|
// CHECK:STDOUT: - filename: full_file.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
//@dump-sem-ir-begin
|
|
a
|
|
// CHECK:STDOUT: - { index: 1, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "a", identifier: 0, has_leading_space: true }
|
|
b
|
|
// CHECK:STDOUT: - { index: 2, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "b", identifier: 1, has_leading_space: true }
|
|
c
|
|
// CHECK:STDOUT: - { index: 3, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "c", identifier: 2, has_leading_space: true }
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 1, end: 3}
|
|
//@dump-sem-ir-end
|
|
|
|
// --- multi_section.carbon
|
|
// CHECK:STDOUT: - filename: multi_section.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
a
|
|
// CHECK:STDOUT: - { index: 1, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "a", identifier: 0, has_leading_space: true }
|
|
//@dump-sem-ir-begin
|
|
b
|
|
// CHECK:STDOUT: - { index: 2, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "b", identifier: 1, has_leading_space: true }
|
|
//@dump-sem-ir-end
|
|
c
|
|
// CHECK:STDOUT: - { index: 3, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "c", identifier: 2, has_leading_space: true }
|
|
//@dump-sem-ir-begin
|
|
d
|
|
// CHECK:STDOUT: - { index: 4, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "d", identifier: 3, has_leading_space: true }
|
|
//@dump-sem-ir-end
|
|
e
|
|
// CHECK:STDOUT: - { index: 5, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "e", identifier: 4, has_leading_space: true }
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 2, end: 2}
|
|
// CHECK:STDOUT: - {begin: 4, end: 4}
|
|
|
|
// --- compact.carbon
|
|
// CHECK:STDOUT: - filename: compact.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 1, end: 0}
|
|
// CHECK:STDOUT: - {begin: 1, end: 0}
|
|
// CHECK:STDOUT: - {begin: 1, end: 0}
|
|
//@dump-sem-ir-begin
|
|
//@dump-sem-ir-end
|
|
//@dump-sem-ir-begin
|
|
//@dump-sem-ir-end
|
|
//@dump-sem-ir-begin
|
|
//@dump-sem-ir-end
|
|
|
|
// --- fail_extra_text.carbon
|
|
// CHECK:STDOUT: - filename: fail_extra_text.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
// CHECK:STDERR: fail_extra_text.carbon:[[@LINE+2]]:3: error: whitespace is required after '//' [NoWhitespaceAfterCommentIntroducer]
|
|
// CHECK:STDERR:
|
|
//@dump-sem-ir-begin more text
|
|
|
|
// --- fail_start_only.carbon
|
|
// CHECK:STDOUT: - filename: fail_start_only.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 1, end: 0}
|
|
|
|
//@dump-sem-ir-begin
|
|
// CHECK:STDERR: fail_start_only.carbon:[[@LINE+2]]:1: error: missing `//@dump-sem-ir-end` to match `//@dump-sem-ir-begin` [DumpSemIRRangeMissingEnd]
|
|
// CHECK:STDERR:
|
|
|
|
// --- fail_end_only.carbon
|
|
// CHECK:STDOUT: - filename: fail_end_only.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
// CHECK:STDERR: fail_end_only.carbon:[[@LINE+2]]:1: error: missing `//@dump-sem-ir-begin` to match `//@dump-sem-ir-end` [DumpSemIRRangeMissingBegin]
|
|
// CHECK:STDERR:
|
|
//@dump-sem-ir-end
|
|
|
|
// --- fail_misordered.carbon
|
|
// CHECK:STDOUT: - filename: fail_misordered.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
a
|
|
// CHECK:STDOUT: - { index: 1, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "a", identifier: 0, has_leading_space: true }
|
|
//@dump-sem-ir-begin
|
|
b
|
|
// CHECK:STDOUT: - { index: 2, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "b", identifier: 1, has_leading_space: true }
|
|
// CHECK:STDERR: fail_misordered.carbon:[[@LINE+2]]:1: error: missing `//@dump-sem-ir-end` to match `//@dump-sem-ir-begin` [DumpSemIRRangeMissingEnd]
|
|
// CHECK:STDERR:
|
|
//@dump-sem-ir-begin
|
|
c
|
|
// CHECK:STDOUT: - { index: 3, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "c", identifier: 2, has_leading_space: true }
|
|
//@dump-sem-ir-end
|
|
d
|
|
// CHECK:STDOUT: - { index: 4, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "d", identifier: 3, has_leading_space: true }
|
|
// CHECK:STDERR: fail_misordered.carbon:[[@LINE+2]]:1: error: missing `//@dump-sem-ir-begin` to match `//@dump-sem-ir-end` [DumpSemIRRangeMissingBegin]
|
|
// CHECK:STDERR:
|
|
//@dump-sem-ir-end
|
|
e
|
|
// CHECK:STDOUT: - { index: 5, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "e", identifier: 4, has_leading_space: true }
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 2, end: 2}
|
|
// CHECK:STDOUT: - {begin: 3, end: 3}
|
|
|
|
// --- fail_count_mismatch.carbon
|
|
// CHECK:STDOUT: - filename: fail_count_mismatch.carbon
|
|
// CHECK:STDOUT: tokens:
|
|
|
|
a
|
|
// CHECK:STDOUT: - { index: 1, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "a", identifier: 0, has_leading_space: true }
|
|
//@dump-sem-ir-begin
|
|
b
|
|
// CHECK:STDOUT: - { index: 2, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "b", identifier: 1, has_leading_space: true }
|
|
//@dump-sem-ir-end
|
|
c
|
|
// CHECK:STDOUT: - { index: 3, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "c", identifier: 2, has_leading_space: true }
|
|
//@dump-sem-ir-begin
|
|
d
|
|
// CHECK:STDOUT: - { index: 4, kind: "Identifier", line: {{ *}}[[@LINE-1]], column: 1, indent: 1, spelling: "d", identifier: 3, has_leading_space: true }
|
|
// CHECK:STDOUT: dump_sem_ir_ranges:
|
|
// CHECK:STDOUT: - {begin: 2, end: 2}
|
|
// CHECK:STDOUT: - {begin: 4, end: 4}
|
|
|
|
// CHECK:STDERR: fail_count_mismatch.carbon:[[@LINE+1]]:17: error: missing `//@dump-sem-ir-end` to match `//@dump-sem-ir-begin` [DumpSemIRRangeMissingEnd]
|
|
// CHECK:STDERR:
|