Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't show invisibles from inlays (#32088)

Browse source 
Closes #24266

Release Notes:

- Whitespace added by inlay hints is no longer shown when
`"show_whitespaces": "all"` is used.

-
This commit is contained in:
Conrad Irwin 2025-06-04 10:33:22 -06:00 • committed by GitHub
parent 7d54d9f45e
commit 2c5aa5891d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -639,6 +639,7 @@ pub struct HighlightedChunk<'a> {
pub text: &'a str,
pub style: Option<HighlightStyle>,
pub is_tab: bool,
pub is_inlay: bool,
pub replacement: Option<ChunkReplacement>,
}
@ -652,6 +653,7 @@ impl<'a> HighlightedChunk<'a> {
let style = self.style;
let is_tab = self.is_tab;
let renderer = self.replacement;
let is_inlay = self.is_inlay;
iter::from_fn(move || {
let mut prefix_len = 0;
while let Some(&ch) = chars.peek() {
@ -667,6 +669,7 @@ impl<'a> HighlightedChunk<'a> {
text: prefix,
style,
is_tab,
is_inlay,
replacement: renderer.clone(),
});
}
@ -693,6 +696,7 @@ impl<'a> HighlightedChunk<'a> {
text: prefix,
style: Some(invisible_style),
is_tab: false,
is_inlay,
replacement: Some(ChunkReplacement::Str(replacement.into())),
});
} else {
@ -716,6 +720,7 @@ impl<'a> HighlightedChunk<'a> {
text: prefix,
style: Some(invisible_style),
is_tab: false,
is_inlay,
replacement: renderer.clone(),
});
}
@ -728,6 +733,7 @@ impl<'a> HighlightedChunk<'a> {
text: remainder,
style,
is_tab,
is_inlay,
replacement: renderer.clone(),
})
} else {
@ -984,6 +990,7 @@ impl DisplaySnapshot {
text: chunk.text,
style: highlight_style,
is_tab: chunk.is_tab,
is_inlay: chunk.is_inlay,
replacement: chunk.renderer.map(ChunkReplacement::Renderer),
}
.highlight_invisibles(editor_style)