TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ui: prompt: Render aliases + border on the doc

Browse source
This commit is contained in:
Blaž Hrastnik 2022-02-20 14:55:16 +09:00
parent 2af04325d8
commit c7b326be04
No known key found for this signature in database
GPG key ID: 1238B9C4AD889640
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
helix-term/src/commands.rs
View file

@ -3384,8 +3384,11 @@ fn command_mode(cx: &mut Context) {
prompt.doc_fn = Box::new(|input: &str| {
let part = input.split(' ').next().unwrap_or_default();
if let Some(cmd::TypableCommand { doc, .. }) = cmd::TYPABLE_COMMAND_MAP.get(part) {
return Some(doc);
if let Some(cmd::TypableCommand { doc, aliases, .. }) = cmd::TYPABLE_COMMAND_MAP.get(part) {
if aliases.is_empty() {
return Some((*doc).into());
}
return Some(format!("{}\nAliases: {}", doc, aliases.join(", ")).into());
}
None

23
helix-term/src/ui/prompt.rs
View file

@ -5,6 +5,7 @@ use helix_view::input::KeyEvent;
use helix_view::keyboard::{KeyCode, KeyModifiers};
use std::{borrow::Cow, ops::RangeFrom};
use tui::buffer::Buffer as Surface;
use tui::widgets::{Block, Borders, Widget};
use helix_core::{
unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position,
@ -26,7 +27,7 @@ pub struct Prompt {
history_pos: Option<usize>,
completion_fn: Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>,
callback_fn: Box<dyn FnMut(&mut Context, &str, PromptEvent)>,
pub doc_fn: Box<dyn Fn(&str) -> Option<&'static str>>,
pub doc_fn: Box<dyn Fn(&str) -> Option<Cow<str>>>,
}
#[derive(Clone, Copy, PartialEq)]
@ -406,14 +407,18 @@ impl Prompt {
let background = theme.get("ui.help");
surface.clear_with(area, background);
text.render(
area.inner(&Margin {
vertical: padding,
horizontal: padding,
}),
surface,
cx,
);
let block = Block::default()
// .title(self.title.as_str())
.borders(Borders::ALL)
.border_style(background);
let inner = block.inner(area).inner(&Margin {
vertical: 0,
horizontal: 1,
});
block.render(area, surface);
text.render(inner, surface, cx);
}
let line = area.height - 1;