git.iko.soy/helix
on master help sign in
Refactor infobox rendering and parsing (#579)
14c08e8Gokul Soumya
helix-term/src/keymap.rs+1−1
compare with master
unifiedsplit
@@ -145,7 +145,7 @@ impl From<KeyTrieNode> for Info {
145 .map(|(desc, keys)| (desc.strip_prefix(&prefix).unwrap(), keys))
145 .map(|(desc, keys)| (desc.strip_prefix(&prefix).unwrap(), keys))
146 .collect();
146 .collect();
147 }
147 }
148− Info::key(node.name(), body)
148+ Info::new(node.name(), body)
149 }
149 }
150}
150}
151
151
helix-term/src/ui/info.rs+12−12
@@ -1,8 +1,8 @@
1use crate::compositor::{Component, Context};
1use crate::compositor::{Component, Context};
2−use helix_view::graphics::Rect;
2+use helix_view::graphics::{Margin, Rect};
3use helix_view::info::Info;
3use helix_view::info::Info;
4use tui::buffer::Buffer as Surface;
4use tui::buffer::Buffer as Surface;
5−use tui::widgets::{Block, Borders, Widget};
5+use tui::widgets::{Block, Borders, Paragraph, Widget};
6
6
7impl Component for Info {
7impl Component for Info {
8 fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
8 fn render(&mut self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
@@ -11,10 +11,11 @@ impl Component for Info {
11 // Calculate the area of the terminal to modify. Because we want to
11 // Calculate the area of the terminal to modify. Because we want to
12 // render at the bottom right, we use the viewport's width and height
12 // render at the bottom right, we use the viewport's width and height
13 // which evaluate to the most bottom right coordinate.
13 // which evaluate to the most bottom right coordinate.
14− let (width, height) = (self.width + 2, self.height + 2);
14+ let width = self.width + 2 + 2; // +2 for border, +2 for margin
15+ let height = self.height + 2; // +2 for border
15 let area = viewport.intersection(Rect::new(
16 let area = viewport.intersection(Rect::new(
16 viewport.width.saturating_sub(width),
17 viewport.width.saturating_sub(width),
17− viewport.height.saturating_sub(height + 2),
18+ viewport.height.saturating_sub(height + 2), // +2 for statusline
18 width,
19 width,
19 height,
20 height,
20 ));
21 ));
@@ -24,15 +25,14 @@ impl Component for Info {
24 .title(self.title.as_str())
25 .title(self.title.as_str())
25 .borders(Borders::ALL)
26 .borders(Borders::ALL)
26 .border_style(style);
27 .border_style(style);
28+
29+ let margin = Margin {
30+ vertical: 0,
31+ horizontal: 1,
32+ };
27− let inner = block.inner(area);
33+ let inner = block.inner(area).inner(&margin);
28 block.render(area, surface);
34 block.render(area, surface);
29
35
30− // Only write as many lines as there are rows available.
36+ Paragraph::new(self.text.as_str()).render(inner, surface);
31− for (y, line) in (inner.y..)
32− .zip(self.text.lines())
33− .take(inner.height as usize)
34− {
35− surface.set_string(inner.x, y, line, style);
36− }
37 }
37 }
38}
38}
helix-view/src/info.rs+22−34
@@ -16,45 +16,33 @@ pub struct Info {
16}
16}
17
17
18impl Info {
18impl Info {
19− // body is a BTreeMap instead of a HashMap because keymaps are represented
20− // with nested hashmaps with no ordering, and each invocation of infobox would
21− // show different orders of items
22− pub fn key(title: &str, body: Vec<(&str, Vec<KeyEvent>)>) -> Info {
19+ pub fn new(title: &str, body: Vec<(&str, Vec<KeyEvent>)>) -> Info {
23− let (lpad, mpad, rpad) = (1, 2, 1);
20+ let body = body
21+ .into_iter()
22+ .map(|(desc, events)| {
23+ let events = events.iter().map(ToString::to_string).collect::<Vec<_>>();
24+ (desc, events.join(", "))
25+ })
26+ .collect::<Vec<_>>();
27+
24− let keymaps_width: u16 = body
28+ let keymaps_width = body.iter().map(|r| r.1.len()).max().unwrap();
25− .iter()
26− .map(|r| r.1.iter().map(|e| e.width() as u16 + 2).sum::<u16>() - 2)
27− .max()
28− .unwrap();
29 let mut text = String::new();
29 let mut text = String::new();
30− let mut width = 0;
30+
31− let height = body.len() as u16;
32− for (desc, keyevents) in body {
31+ for (desc, keyevents) in &body {
33− let keyevent = keyevents[0];
34− let mut left = keymaps_width - keyevent.width() as u16;
35− for _ in 0..lpad {
36− text.push(' ');
37− }
38− write!(text, "{}", keyevent).ok();
39− for keyevent in &keyevents[1..] {
40− write!(text, ", {}", keyevent).ok();
41− left -= 2 + keyevent.width() as u16;
42− }
43− for _ in 0..left + mpad {
44− text.push(' ');
45− }
46− let desc = desc.trim();
47− let w = lpad + keymaps_width + mpad + (desc.width() as u16) + rpad;
48− if w > width {
49− width = w;
50− }
51− writeln!(text, "{}", desc).ok();
32+ let _ = writeln!(
33+ text,
34+ "{:width$} {}",
35+ keyevents,
36+ desc,
37+ width = keymaps_width
38+ );
52 }
39 }
40+
53 Info {
41 Info {
54 title: title.to_string(),
42 title: title.to_string(),
43+ width: text.lines().map(|l| l.width()).max().unwrap() as u16,
44+ height: body.len() as u16,
55 text,
45 text,
56− width,
57− height,
58 }
46 }
59 }
47 }
60}
48}