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

Add indent guides support

Browse Source
This commit is contained in:
Gokul Soumya 2022-04-02 14:09:13 +05:30 committed by Blaž Hrastnik
parent 6a3f7f2c39
commit 8c4c923e80
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
helix-term/src/ui/editor.rs
View File

@ -401,6 +401,23 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
let text_style = theme.get("ui.text");
let whitespace_style = theme.get("ui.virtual.whitespace");
let mut is_in_indent_area = true;
let mut last_line_indent_level = 0;
let indent_style = theme
.try_get("ui.virtual.indent-guide")
.unwrap_or_else(|| theme.get("comment"));
let draw_indent_guides = |indent_level, line, surface: &mut Surface| {
for i in 0..(indent_level / tab_width as u16) {
surface.set_string(
viewport.x + (i * tab_width as u16) - offset.col as u16,
viewport.y + line,
"│",
indent_style,
);
}
};
'outer: for event in highlights {
match event {
HighlightEvent::HighlightStart(span) => {
@ -453,8 +470,18 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
);
}
// This is an empty line; draw indent guides at previous line's
// indent level to avoid breaking the guides on blank lines.
if visual_x == 0 {
draw_indent_guides(last_line_indent_level, line, surface);
} else if is_in_indent_area {
// A line with whitespace only
draw_indent_guides(visual_x, line, surface);
}
visual_x = 0;
line += 1;
is_in_indent_area = true;
// TODO: with proper iter this shouldn't be necessary
if line >= viewport.height {
@ -499,6 +526,11 @@ pub fn render_text_highlights<H: Iterator<Item = HighlightEvent>>(
},
);
}
if is_in_indent_area && !(grapheme == " " || grapheme == "\t") {
draw_indent_guides(visual_x, line, surface);
is_in_indent_area = false;
last_line_indent_level = visual_x;
}
visual_x = visual_x.saturating_add(width as u16);
}