Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent whitespace from rendering inside inlay hints #6312

Merged
merged 5 commits into from
Mar 16, 2023
Merged

Prevent whitespace from rendering inside inlay hints #6312

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fad1794
fix spaces and nbsps showing in inlay hints
Zenthial Mar 14, 2023
4108d05
remove origin
Zenthial Mar 14, 2023
88a2a2c
virtual tab + fix unneeded clone
Zenthial Mar 14, 2023
8b08bb4
update virtual tab determining location
Zenthial Mar 15, 2023
708bae8
fix clippy lint
Zenthial Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions helix-term/src/ui/document.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,11 @@ pub fn render_text<'t>(
style_span.0
};

let virt = grapheme.is_virtual();
renderer.draw_grapheme(
grapheme.grapheme,
grapheme_style,
virt,
&mut last_line_indent_level,
&mut is_in_indent_area,
pos,
Expand All @@ -313,6 +315,7 @@ pub struct TextRenderer<'a> {
pub nbsp: String,
pub space: String,
pub tab: String,
pub virtual_tab: String,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must this be String? Can it be integer instead?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No we need the allocation to be able to hand out &str to it, just like the tab field. The tab width is not the interesting part here, we already know that from the grapheme.

pub indent_width: u16,
pub starting_indent: usize,
pub draw_indent_guides: bool,
Expand Down Expand Up @@ -342,6 +345,7 @@ impl<'a> TextRenderer<'a> {
} else {
" ".repeat(tab_width)
};
let virtual_tab = " ".repeat(tab_width);
let newline = if ws_render.newline() == WhitespaceRenderValue::All {
ws_chars.newline.into()
} else {
Expand Down Expand Up @@ -370,6 +374,7 @@ impl<'a> TextRenderer<'a> {
nbsp,
space,
tab,
virtual_tab,
whitespace_style: theme.get("ui.virtual.whitespace"),
indent_width,
starting_indent: col_offset / indent_width as usize
Expand All @@ -392,6 +397,7 @@ impl<'a> TextRenderer<'a> {
&mut self,
grapheme: Grapheme,
mut style: Style,
is_virtual: bool,
last_indent_level: &mut usize,
is_in_indent_area: &mut bool,
position: Position,
Expand All @@ -405,14 +411,21 @@ impl<'a> TextRenderer<'a> {
}

let width = grapheme.width();
let space = if is_virtual { " " } else { &self.space };
let nbsp = if is_virtual { " " } else { &self.nbsp };
let tab = if is_virtual {
&self.virtual_tab
} else {
&self.tab
};
let grapheme = match grapheme {
Grapheme::Tab { width } => {
let grapheme_tab_width = char_to_byte_idx(&self.tab, width);
&self.tab[..grapheme_tab_width]
let grapheme_tab_width = char_to_byte_idx(tab, width);
&tab[..grapheme_tab_width]
}
// TODO special rendering for other whitespaces?
Grapheme::Other { ref g } if g == " " => &self.space,
Grapheme::Other { ref g } if g == "\u{00A0}" => &self.nbsp,
Grapheme::Other { ref g } if g == " " => space,
Grapheme::Other { ref g } if g == "\u{00A0}" => nbsp,
Grapheme::Other { ref g } => g,
Grapheme::Newline => &self.newline,
};
Expand Down