mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-10 12:28:25 +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
43 lines
1.8 KiB
C++
43 lines
1.8 KiB
C++
// 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
|
|
|
|
#ifndef CARBON_TOOLCHAIN_CHECK_CPP_LOCATION_H_
|
|
#define CARBON_TOOLCHAIN_CHECK_CPP_LOCATION_H_
|
|
|
|
#include "toolchain/check/context.h"
|
|
#include "toolchain/sem_ir/ids.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
// Maps a Carbon source location into an equivalent Clang source location.
|
|
auto GetCppLocation(Context& context, SemIR::LocId loc_id)
|
|
-> clang::SourceLocation;
|
|
|
|
// Maps a Carbon source location into the Clang range covering the source a
|
|
// Carbon diagnostic marked with it would underline, which is everything the
|
|
// node spans rather than the one token it names.
|
|
//
|
|
// In Carbon source this is a character range, since Clang finds the end of a
|
|
// token range by lexing the token there as C++. Only the file being checked has
|
|
// its subtrees available, so a location in an imported file gives the range of
|
|
// the one token `GetCppLocation` names. A location that is already in C++ gives
|
|
// a token range at that token, which Clang can measure.
|
|
auto GetCppRange(Context& context, SemIR::LocId loc_id)
|
|
-> clang::CharSourceRange;
|
|
|
|
// Adds an `ImportIRInst` referring to the given source range and returns a
|
|
// corresponding `ImportIRInstId` that can be used to construct a `LocId`. The
|
|
// range is what a diagnostic marking the location underlines.
|
|
auto AddImportIRInst(SemIR::File& file, clang::CharSourceRange clang_range)
|
|
-> SemIR::ImportIRInstId;
|
|
|
|
// The same for a Clang location, which is a point and marks the one column it
|
|
// names.
|
|
auto AddImportIRInst(SemIR::File& file, clang::SourceLocation clang_source_loc)
|
|
-> SemIR::ImportIRInstId;
|
|
|
|
} // namespace Carbon::Check
|
|
|
|
#endif // CARBON_TOOLCHAIN_CHECK_CPP_LOCATION_H_
|