mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 16:58:09 +00:00
Chandler Carruth
2c9739799b
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
114 lines
3.2 KiB
Plaintext
114 lines
3.2 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
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/int.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/impl/access.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/impl/access.carbon
|
|
|
|
// --- shared.carbon
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface I { fn Get(self: Self) -> i32; }
|
|
interface J { fn Get(self: Self) -> i32; }
|
|
interface K(T: type) { fn Get(t: T) -> i32; }
|
|
|
|
// --- impl_in_class_valid_access.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import library "shared";
|
|
|
|
class A {
|
|
private var n: i32;
|
|
impl A as I {
|
|
fn Get(self: Self) -> i32 {
|
|
return self.n;
|
|
}
|
|
}
|
|
|
|
impl as K(A) {
|
|
fn Get(t: A) -> i32 {
|
|
return t.n;
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- fail_impl_in_other_class1.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import library "shared";
|
|
|
|
class B {
|
|
private var m: i32;
|
|
}
|
|
|
|
class A {
|
|
private var n: i32;
|
|
|
|
impl B as I {
|
|
fn Get(self: B) -> i32 {
|
|
// CHECK:STDERR: fail_impl_in_other_class1.carbon:[[@LINE+3]]:20-25: error: cannot access private member `m` of type `B` [ClassInvalidMemberAccess]
|
|
// CHECK:STDERR: fail_impl_in_other_class1.carbon:[[@LINE-9]]:17-22: note: declared here [ClassMemberDeclaration]
|
|
// CHECK:STDERR:
|
|
return self.m;
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- fail_impl_in_other_class2.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import library "shared";
|
|
|
|
class B {
|
|
private var m: i32;
|
|
}
|
|
|
|
class A {
|
|
private var n: i32;
|
|
|
|
impl as K(B) {
|
|
fn Get(t: B) -> i32 {
|
|
// CHECK:STDERR: fail_impl_in_other_class2.carbon:[[@LINE+3]]:20-22: error: cannot access private member `m` of type `B` [ClassInvalidMemberAccess]
|
|
// CHECK:STDERR: fail_impl_in_other_class2.carbon:[[@LINE-9]]:17-22: note: declared here [ClassMemberDeclaration]
|
|
// CHECK:STDERR:
|
|
return t.m;
|
|
}
|
|
}
|
|
}
|
|
|
|
// --- fail_impl_outside_class1.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import library "shared";
|
|
|
|
class A {
|
|
private var n: i32;
|
|
}
|
|
|
|
impl A as J {
|
|
fn Get(self: Self) -> i32 {
|
|
// CHECK:STDERR: fail_impl_outside_class1.carbon:[[@LINE+3]]:16-21: error: cannot access private member `n` of type `A` [ClassInvalidMemberAccess]
|
|
// CHECK:STDERR: fail_impl_outside_class1.carbon:[[@LINE-6]]:17-22: note: declared here [ClassMemberDeclaration]
|
|
// CHECK:STDERR:
|
|
return self.n;
|
|
}
|
|
}
|
|
|
|
// --- fail_impl_outside_class2.carbon
|
|
library "[[@TEST_NAME]]";
|
|
import library "shared";
|
|
|
|
class B {
|
|
private var m: i32;
|
|
}
|
|
|
|
impl B as J {
|
|
fn Get(self: B) -> i32 {
|
|
// CHECK:STDERR: fail_impl_outside_class2.carbon:[[@LINE+3]]:16-21: error: cannot access private member `m` of type `B` [ClassInvalidMemberAccess]
|
|
// CHECK:STDERR: fail_impl_outside_class2.carbon:[[@LINE-6]]:17-22: note: declared here [ClassMemberDeclaration]
|
|
// CHECK:STDERR:
|
|
return self.m;
|
|
}
|
|
}
|