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
65 lines
3.5 KiB
Plaintext
65 lines
3.5 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/convert.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/class/fail_modifiers.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/class/fail_modifiers.carbon
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:9-15: error: `private` repeated on declaration [ModifierRepeated]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: note: `private` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
private private class DuplicatePrivate;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-8: error: `abstract` not allowed on `class` forward declaration, only definition [ModifierOnlyAllowedOnDefinition]
|
|
// CHECK:STDERR:
|
|
abstract class AbstractDecl;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:9-17: error: `protected` not allowed on declaration with `private` [ModifierNotAllowedWith]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-7: note: `private` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
private protected class TwoAccess;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-4: error: `base` not allowed on `class` forward declaration, only definition [ModifierOnlyAllowedOnDefinition]
|
|
// CHECK:STDERR:
|
|
base class BaseDecl;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:10-17: error: `abstract` repeated on declaration [ModifierRepeated]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-8: note: `abstract` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
abstract abstract class TwoAbstract { }
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+7]]:19-22: error: `base` not allowed on declaration with `virtual` [ModifierNotAllowedWith]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:11-17: note: `virtual` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+4]]:1-9: error: `protected` not allowed; requires class scope [ModifierProtectedNotAllowed]
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:11-17: error: `virtual` not allowed on `class` declaration [ModifierNotAllowedOnDeclaration]
|
|
// CHECK:STDERR:
|
|
protected virtual base class Virtual {}
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:10-18: error: `protected` must appear before `abstract` [ModifierMustAppearBefore]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-8: note: `abstract` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
abstract protected class WrongOrder { }
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:10-13: error: `base` not allowed on declaration with `abstract` [ModifierNotAllowedWith]
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:1-8: note: `abstract` previously appeared here [ModifierPrevious]
|
|
// CHECK:STDERR:
|
|
abstract base class AbstractAndBase {}
|
|
|
|
abstract class AbstractWithDefinition {
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:30: error: definition of `abstract` function [DefinedAbstractFunction]
|
|
// CHECK:STDERR:
|
|
abstract fn F(unused self) {}
|
|
abstract fn G(self);
|
|
}
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+2]]:42: error: definition of `abstract` function [DefinedAbstractFunction]
|
|
// CHECK:STDERR:
|
|
fn AbstractWithDefinition.G(unused self) {
|
|
}
|