andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-01-19 21:47:07 +04:00
Code Issues Projects Releases Wiki Activity

fix: Allow multi-line prompt documentation

Browse Source
This commit is contained in:
Blaž Hrastnik 2022-02-20 14:44:44 +09:00
parent a449156702
commit 2af04325d8
No known key found for this signature in database
GPG Key ID: 1238B9C4AD889640
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-term/src/ui/markdown.rs
View File

@ -247,19 +247,8 @@ fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
// TODO: account for tab width
let max_text_width = (viewport.0 - padding).min(120);
let mut text_width = 0;
let mut height = padding;
for content in contents {
height += 1;
let content_width = content.width() as u16;
if content_width > max_text_width {
text_width = max_text_width;
height += content_width / max_text_width;
} else if content_width > text_width {
text_width = content_width;
}
}
let (width, height) = crate::ui::text::required_size(&contents, max_text_width);
Some((text_width + padding, height))
Some((width + padding * 2, height))
}
}

16
helix-term/src/ui/prompt.rs
View File

@ -389,12 +389,18 @@ pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context)
if let Some(doc) = (self.doc_fn)(&self.line) {
let mut text = ui::Text::new(doc.to_string());
let max_width = BASE_WIDTH * 3;
let padding = 1;
let viewport = area;
let (_width, height) = ui::text::required_size(&text.contents, max_width);
let area = viewport.intersection(Rect::new(
completion_area.x,
completion_area.y.saturating_sub(3),
BASE_WIDTH * 3,
3,
completion_area.y.saturating_sub(height + padding * 2),
max_width,
height + padding * 2,
));
let background = theme.get("ui.help");
@ -402,8 +408,8 @@ pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context)
text.render(
area.inner(&Margin {
vertical: 1,
horizontal: 1,
vertical: padding,
horizontal: padding,
}),
surface,
cx,

18
helix-term/src/ui/text.rs
View File

@ -4,7 +4,7 @@
use helix_view::graphics::Rect;
pub struct Text {
contents: tui::text::Text<'static>,
pub(crate) contents: tui::text::Text<'static>,
size: (u16, u16),
viewport: (u16, u16),
}
@ -49,3 +49,19 @@ fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
Some(self.size)
}
}
pub fn required_size(text: &tui::text::Text, max_text_width: u16) -> (u16, u16) {
let mut text_width = 0;
let mut height = 0;
for content in &text.lines {
height += 1;
let content_width = content.width() as u16;
if content_width > max_text_width {
text_width = max_text_width;
height += content_width / max_text_width;
} else if content_width > text_width {
text_width = content_width;
}
}
(text_width, height)
}