carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Start to preserve type sugar in diagnostics. (#7768)

Browse Source 
Instead of always printing types as canonical, attempt to find a sugared
type where possible, and include that type in the diagnostic. We can
only do this when given the instruction whose type is being printed
(`TypeOfInstId`) rather than the canonical type ID.

Initial support here is intentionally minimal: just looking through
calls to the callee's declared return type, and looking through pointer
dereferences and corresponding pointer types, to build out the initial
infrastructure. More cases can be added later; this degrades gracefully
to using the canonical type if a better type can't be found.

Assisted-by: Claude Opus 5 via Antigravity
This commit is contained in:
Richard Smith
2026-09-15 23:11:58 +00:00
committed by GitHub
parent d8c4fc51cd
commit f3d67de480
9 changed files with 435 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/language_server/handle_position.cpp
+6 -8
View File
@@ -20,18 +20,16 @@ namespace Carbon::LanguageServer {
// if it has no type. Instructions that aren't values, such as declarations of
// namespaces, have no type to show.
//
// TODO: `StringifyConstantInst` renders some types as placeholders such as
// TODO: `StringifyTypeOfInst` renders some types as placeholders such as
// `<type of F>` for a function and `<pattern for i32>` for a binding pattern,
// which is unhelpful as hover text. Show the signature for a function, and the
// bound type rather than the pattern type for a binding.
static auto StringifyTypeOfInst(const SemIR::File& sem_ir,
SemIR::InstId inst_id) -> std::string {
auto type_id = sem_ir.insts().Get(inst_id).type_id();
if (!type_id.has_value()) {
static auto StringifyTypeForHover(const SemIR::File& sem_ir,
SemIR::InstId inst_id) -> std::string {
if (!sem_ir.insts().Get(inst_id).type_id().has_value()) {
return "";
}
return SemIR::StringifyConstantInst(sem_ir,
sem_ir.types().GetTypeInstId(type_id));
return SemIR::StringifyTypeOfInst(sem_ir, inst_id);
}
// Given a position-based query, returns the corresponding position information.
@@ -78,7 +76,7 @@ auto HandleHover(
const auto& sem_ir = *info.file->sem_ir();
RawStringOstream text;
text << "```carbon\n" << info.file->tokens().GetTokenText(info.token);
if (auto type = StringifyTypeOfInst(sem_ir, info.inst_id); !type.empty()) {
if (auto type = StringifyTypeForHover(sem_ir, info.inst_id); !type.empty()) {
text << ": " << type;
}
text << "\n```";