andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

refactor: group common render data into new type

Browse Source 
This resolved the too-many-arguments linting error for the `draw_grapheme` function.
This commit is contained in:
sunshine 2024-08-18 13:20:38 -04:00
parent 580d9d28f7
commit 545d2af71d
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helix-term/src/ui/document.rs
View File

@ -238,17 +238,20 @@ pub fn render_text(
};
decorations.decorate_grapheme(renderer, &grapheme);
let virt = grapheme.is_virtual();
let is_virtual = grapheme.is_virtual();
let is_selected = selection.is_some_and(|selection| {
selection
.iter()
.any(|range| range.contains(grapheme.char_idx))
});
let grapheme_render_data = GraphemeRenderData {
is_virtual,
is_selected,
};
let grapheme_width = renderer.draw_grapheme(
grapheme.raw,
grapheme_style,
virt,
is_selected,
grapheme_render_data,
&mut last_line_indent_level,
&mut is_in_indent_area,
grapheme.visual_pos,
@ -280,6 +283,11 @@ pub struct GraphemeStyle {
overlay_style: Style,
}
pub struct GraphemeRenderData {
is_virtual: bool,
is_selected: bool,
}
impl<'a> TextRenderer<'a> {
pub fn new(
surface: &'a mut Surface,
@ -365,8 +373,7 @@ pub fn draw_grapheme(
&mut self,
grapheme: Grapheme,
grapheme_style: GraphemeStyle,
is_virtual: bool,
is_selected: bool,
grapheme_render_data: GraphemeRenderData,
last_indent_level: &mut usize,
is_in_indent_area: &mut bool,
mut position: Position,
@ -387,6 +394,10 @@ pub fn draw_grapheme(
let width = grapheme.width();
let GraphemeRenderData {
is_virtual,
is_selected,
} = grapheme_render_data;
let ws = &self.whitespace_entries;
let tab = &ws.tab.render(is_virtual, is_selected);
let space = &ws.space.render(is_virtual, is_selected);