mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 10:28:11 +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
160 lines
4.3 KiB
Python
160 lines
4.3 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")
|
|
|
|
package(default_visibility = ["//visibility:public"])
|
|
|
|
filegroup(
|
|
name = "testdata",
|
|
srcs = glob(["testdata/**/*.carbon"]),
|
|
)
|
|
|
|
cc_library(
|
|
name = "language_server",
|
|
srcs = ["language_server.cpp"],
|
|
hdrs = ["language_server.h"],
|
|
deps = [
|
|
":context",
|
|
":incoming_messages",
|
|
":outgoing_messages",
|
|
"//common:ostream",
|
|
"//common:raw_string_ostream",
|
|
"//toolchain/base:install_paths",
|
|
"//toolchain/diagnostics:emitter",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "sem_ir_index",
|
|
srcs = ["sem_ir_index.cpp"],
|
|
hdrs = ["sem_ir_index.h"],
|
|
deps = [
|
|
"//toolchain/base:grouped_value_store",
|
|
"//toolchain/lex:token_index",
|
|
"//toolchain/lex:token_kind",
|
|
"//toolchain/lex:tokenized_buffer",
|
|
"//toolchain/parse:node_kind",
|
|
"//toolchain/parse:tree",
|
|
"//toolchain/sem_ir:file",
|
|
"//toolchain/sem_ir:typed_insts",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "sem_ir_text",
|
|
srcs = ["sem_ir_text.cpp"],
|
|
hdrs = ["sem_ir_text.h"],
|
|
deps = [
|
|
"//common:raw_string_ostream",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "context",
|
|
srcs = ["context.cpp"],
|
|
hdrs = ["context.h"],
|
|
deps = [
|
|
":sem_ir_index",
|
|
":sem_ir_text",
|
|
"//common:check",
|
|
"//common:map",
|
|
"//common:raw_string_ostream",
|
|
"//toolchain/base:clang_invocation",
|
|
"//toolchain/base:install_paths",
|
|
"//toolchain/base:shared_value_stores",
|
|
"//toolchain/check",
|
|
"//toolchain/diagnostics:emitter",
|
|
"//toolchain/diagnostics:file_diagnostics",
|
|
"//toolchain/diagnostics:renderer",
|
|
"//toolchain/driver:codegen_options",
|
|
"//toolchain/driver:compile_driver",
|
|
"//toolchain/driver:compile_options",
|
|
"//toolchain/lex",
|
|
"//toolchain/lex:tokenized_buffer",
|
|
"//toolchain/parse",
|
|
"//toolchain/parse:tree",
|
|
"//toolchain/sem_ir:file",
|
|
"//toolchain/source:source_buffer",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
"@llvm-project//llvm:Support",
|
|
"@llvm-project//llvm:TargetParser",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "position",
|
|
srcs = ["position.cpp"],
|
|
hdrs = ["position.h"],
|
|
deps = [
|
|
":context",
|
|
":sem_ir_index",
|
|
"//toolchain/lex:token_index",
|
|
"//toolchain/lex:tokenized_buffer",
|
|
"//toolchain/parse:tree",
|
|
"//toolchain/sem_ir:file",
|
|
"//toolchain/sem_ir:typed_insts",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "handle",
|
|
srcs = glob(["handle_*.cpp"]),
|
|
hdrs = [
|
|
"handle.h",
|
|
"handle_sem_ir_text.h",
|
|
],
|
|
deps = [
|
|
":context",
|
|
":position",
|
|
":sem_ir_index",
|
|
":sem_ir_text",
|
|
"//common:check",
|
|
"//common:raw_string_ostream",
|
|
"//toolchain/base:shared_value_stores",
|
|
"//toolchain/format",
|
|
"//toolchain/lex",
|
|
"//toolchain/lex:token_index",
|
|
"//toolchain/lex:token_kind",
|
|
"//toolchain/parse",
|
|
"//toolchain/parse:node_kind",
|
|
"//toolchain/parse:tree",
|
|
"//toolchain/sem_ir:file",
|
|
"//toolchain/sem_ir:stringify",
|
|
"//toolchain/sem_ir:typed_insts",
|
|
"//toolchain/source:source_buffer",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
"@llvm-project//llvm:Support",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "incoming_messages",
|
|
srcs = ["incoming_messages.cpp"],
|
|
hdrs = ["incoming_messages.h"],
|
|
deps = [
|
|
":context",
|
|
":handle",
|
|
"//common:check",
|
|
"//common:map",
|
|
"//common:ostream",
|
|
"//common:raw_string_ostream",
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
],
|
|
)
|
|
|
|
cc_library(
|
|
name = "outgoing_messages",
|
|
hdrs = ["outgoing_messages.h"],
|
|
deps = [
|
|
"@llvm-project//clang-tools-extra/clangd:ClangDaemon",
|
|
],
|
|
)
|