vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

editor: Extend underlines into inlay hints (#56407)

Browse source 
bad:
<img width="577" height="118" alt="image"
src="https://github.com/user-attachments/assets/52fc13a3-d644-42c3-bd69-048caf85d7bd"
/>
good:
<img width="617" height="130" alt="image"
src="https://github.com/user-attachments/assets/040b26b7-8ee9-4202-bc26-2c995c735286"
/>

Release Notes:

- N/A or Added/Fixed/Improved ...
This commit is contained in:
Cameron Mcloughlin 2026-05-13 07:52:46 +01:00 committed by GitHub
parent cc84bed4eb
commit 394f022be1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 75 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
crates/editor/src/display_map.rs
View file

@ -1815,71 +1815,89 @@ impl DisplaySnapshot {
edit_prediction: Some(editor_style.edit_prediction_styles),
},
)
.flat_map(|chunk| {
let syntax_highlight_style = chunk
.syntax_highlight_id
.and_then(|id| editor_style.syntax.get(id).cloned());
.flat_map({
// track the current underline style so that we can apply it to
// inlay hints within the diagnostic's span
let mut current_diagnostic_underline: Option<UnderlineStyle> = None;
let chunk_highlight = chunk.highlight_style.map(|chunk_highlight| {
HighlightStyle {
// For color inlays, blend the color with the editor background
// if the color has transparency (alpha < 1.0)
color: chunk_highlight.color.map(|color| {
if chunk.is_inlay && !color.is_opaque() {
editor_style.background.blend(color)
} else {
color
}
}),
underline: chunk_highlight
.underline
.filter(|_| editor_style.show_underlines),
..chunk_highlight
}
});
move |chunk| {
let syntax_highlight_style = chunk
.syntax_highlight_id
.and_then(|id| editor_style.syntax.get(id).cloned());
let diagnostic_highlight = chunk
.diagnostic_severity
.filter(|severity| {
self.diagnostics_max_severity
.into_lsp()
.is_some_and(|max_severity| severity <= &max_severity)
})
.map(|severity| HighlightStyle {
fade_out: chunk
.is_unnecessary
.then_some(editor_style.unnecessary_code_fade),
underline: (chunk.underline
&& editor_style.show_underlines
&& !(chunk.is_unnecessary && severity > lsp::DiagnosticSeverity::WARNING))
.then(|| {
let diagnostic_color = diagnostic_style(severity, &editor_style.status);
UnderlineStyle {
color: Some(diagnostic_color),
thickness: 1.0.into(),
wavy: true,
let chunk_highlight = chunk.highlight_style.map(|chunk_highlight| {
HighlightStyle {
// For color inlays, blend the color with the editor background
// if the color has transparency (alpha < 1.0)
color: chunk_highlight.color.map(|color| {
if chunk.is_inlay && !color.is_opaque() {
editor_style.background.blend(color)
} else {
color
}
}),
..Default::default()
underline: chunk_highlight
.underline
.filter(|_| editor_style.show_underlines),
..chunk_highlight
}
});
let style = [
syntax_highlight_style,
chunk_highlight,
diagnostic_highlight,
]
.into_iter()
.flatten()
.reduce(|acc, highlight| acc.highlight(highlight));
let diagnostic_highlight = if chunk.is_inlay {
current_diagnostic_underline.map(|underline| HighlightStyle {
underline: Some(underline),
..Default::default()
})
} else {
let highlight = chunk
.diagnostic_severity
.filter(|severity| {
self.diagnostics_max_severity
.into_lsp()
.is_some_and(|max_severity| severity <= &max_severity)
})
.map(|severity| HighlightStyle {
fade_out: chunk
.is_unnecessary
.then_some(editor_style.unnecessary_code_fade),
underline: (chunk.underline
&& editor_style.show_underlines
&& !(chunk.is_unnecessary
&& severity > lsp::DiagnosticSeverity::WARNING))
.then(|| {
let diagnostic_color =
diagnostic_style(severity, &editor_style.status);
UnderlineStyle {
color: Some(diagnostic_color),
thickness: 1.0.into(),
wavy: true,
}
}),
..Default::default()
});
HighlightedChunk {
text: chunk.text,
style,
is_tab: chunk.is_tab,
is_inlay: chunk.is_inlay,
replacement: chunk.renderer.map(ChunkReplacement::Renderer),
current_diagnostic_underline = highlight.as_ref().and_then(|h| h.underline);
highlight
};
let style = [
syntax_highlight_style,
chunk_highlight,
diagnostic_highlight,
]
.into_iter()
.flatten()
.reduce(|acc, highlight| acc.highlight(highlight));
HighlightedChunk {
text: chunk.text,
style,
is_tab: chunk.is_tab,
is_inlay: chunk.is_inlay,
replacement: chunk.renderer.map(ChunkReplacement::Renderer),
}
.highlight_invisibles(editor_style)
}
.highlight_invisibles(editor_style)
})
}