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 2 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
9 changes: 7 additions & 2 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().clone();
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
let virt = grapheme.is_virtual().clone();
let virt = grapheme.is_virtual();

Doesn't really make a difference but cloning a bool is kind of pointless

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Had this as a relic when I was working with &bool

renderer.draw_grapheme(
grapheme.grapheme,
grapheme_style,
virt,
&mut last_line_indent_level,
&mut is_in_indent_area,
pos,
Expand Down Expand Up @@ -392,6 +394,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 +408,16 @@ 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 grapheme = match grapheme {
Grapheme::Tab { width } => {
let grapheme_tab_width = char_to_byte_idx(&self.tab, width);
Copy link
Member

Choose a reason for hiding this comment

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

To properly render tabs you need to add a second field virtual_tab to which gets filled with white spaces in new instead of using whitespace chars.

Copy link
Contributor Author

@Zenthial Zenthial Mar 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Gotcha. I believe its a bit verbose inside the Grapheme::Tab match, but it should now handle the tab rendering

Copy link
Member

Choose a reason for hiding this comment

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

Looks good now but I would prefer if you could move the if condition outside the match and handle it just like the other variables (so let tab = ..).

I thought it was quite clean how you did it for the other whitespace chars so it would be great if tab was the same

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That makes sense, done.

&self.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