mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 07:38:10 +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
109 lines
2.8 KiB
Python
109 lines
2.8 KiB
Python
# 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
|
|
|
|
load("//bazel/cc_rules:defs.bzl", "cc_library", "cc_test")
|
|
load("//testing/file_test:rules.bzl", "file_test")
|
|
|
|
package(default_visibility = ["//visibility:public"])
|
|
|
|
filegroup(
|
|
name = "all_testdata",
|
|
srcs = [
|
|
"//toolchain/check:testdata",
|
|
"//toolchain/codegen:testdata",
|
|
"//toolchain/diagnostics:testdata",
|
|
"//toolchain/driver:testdata",
|
|
"//toolchain/format:testdata",
|
|
"//toolchain/language_server:testdata",
|
|
"//toolchain/lex:testdata",
|
|
"//toolchain/lower:testdata",
|
|
"//toolchain/parse:testdata",
|
|
],
|
|
)
|
|
|
|
filegroup(
|
|
name = "min_prelude",
|
|
srcs = glob(["testdata/min_prelude/**/*.carbon"]),
|
|
visibility = ["//visibility:public"],
|
|
)
|
|
|
|
cc_library(
|
|
name = "compile_helper",
|
|
testonly = 1,
|
|
srcs = ["compile_helper.cpp"],
|
|
hdrs = ["compile_helper.h"],
|
|
deps = [
|
|
"//toolchain/diagnostics:emitter",
|
|
"//toolchain/diagnostics:renderer",
|
|
"//toolchain/lex",
|
|
"//toolchain/parse",
|
|
"//toolchain/parse:tree",
|
|
"//toolchain/source:source_buffer",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "coverage_helper",
|
|
testonly = 1,
|
|
hdrs = ["coverage_helper.h"],
|
|
deps = [
|
|
"//common:find",
|
|
"//common:set",
|
|
"@googletest//:gtest",
|
|
"@llvm-project//llvm:Support",
|
|
"@re2",
|
|
],
|
|
)
|
|
|
|
file_test(
|
|
name = "file_test",
|
|
size = "small",
|
|
timeout = "moderate", # Taking >60 seconds in GitHub actions
|
|
srcs = ["file_test.cpp"],
|
|
data = [
|
|
":min_prelude",
|
|
"//toolchain/install:clang_hdrs",
|
|
"//toolchain/install:clang_headers_manifest.txt",
|
|
],
|
|
tests = [":all_testdata"],
|
|
deps = [
|
|
"//common:all_llvm_targets",
|
|
"//common:check",
|
|
"//common:error",
|
|
"//testing/file_test:autoupdate",
|
|
"//testing/file_test:file_test_base",
|
|
"//toolchain/driver",
|
|
"@abseil-cpp//absl/strings",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "yaml_test_helpers",
|
|
testonly = 1,
|
|
srcs = ["yaml_test_helpers.cpp"],
|
|
hdrs = ["yaml_test_helpers.h"],
|
|
deps = [
|
|
"//common:error",
|
|
"//common:ostream",
|
|
"//common:raw_string_ostream",
|
|
"@abseil-cpp//absl/strings",
|
|
"@googletest//:gtest",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_test(
|
|
name = "yaml_test_helpers_test",
|
|
size = "small",
|
|
srcs = ["yaml_test_helpers_test.cpp"],
|
|
deps = [
|
|
":yaml_test_helpers",
|
|
"//common:error_test_helpers",
|
|
"//testing/base:gtest_main",
|
|
"@googletest//:gtest",
|
|
],
|
|
)
|