mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-06-07 21:56:04 +02:00
Code Issues

added prompt close

This commit is contained in:
Jan Hrastnik 2020-10-19 19:39:35 +02:00
parent ae8ff9623e
commit 06502e5a2e
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
helix-term/src/application.rs
View File

@ -235,7 +235,14 @@ pub fn render_statusline(&mut self, view: &View) {
.set_string(1, self.size.1 - 2, mode, self.text_color);
}
pub fn render_prompt(&mut self, prompt: &Prompt) {
pub fn render_prompt(&mut self, view: &View, prompt: &Prompt) {
// completion
if prompt.completion.is_some() {
self.surface.set_style(
Rect::new(0, self.size.1 - 6, self.size.0, 4),
view.theme.get("ui.statusline"),
);
}
// render buffer text
self.surface
.set_string(1, self.size.1 - 1, &prompt.prompt, self.text_color);
@ -309,10 +316,13 @@ fn render(&mut self) {
if let Some(view) = &mut self.editor.view {
self.terminal.render_view(view, viewport);
}
if let Some(prompt) = &self.prompt {
self.terminal.render_prompt(prompt);
if let Some(prompt) = &self.prompt {
if prompt.should_close {
self.prompt = None;
} else {
self.terminal.render_prompt(view, prompt);
}
}
}
self.terminal.draw();
@ -383,7 +393,23 @@ pub async fn event_loop(&mut self) {
{
let prompt = Prompt::new(
":".to_owned(),
|_input: &str| None, // completion
|_input: &str| {
let placeholder_list = vec![
String::from("aaa"),
String::from("bbb"),
String::from("ccc"),
];
let mut matches = vec![];
for command in placeholder_list {
if command.contains(_input) {
matches.push(command);
}
}
if matches.len() != 0 {
return Some(matches);
}
None
}, // completion
|editor: &mut Editor, input: &str| match input {
"q" => editor.should_close = true,
_ => (),

13
helix-view/src/prompt.rs
View File

@ -6,20 +6,24 @@ pub struct Prompt {
pub prompt: String,
pub line: String,
pub cursor: usize,
completion_fn: Box<dyn FnMut(&str) -> Option<Vec<&str>>>,
pub completion: Option<Vec<String>>,
pub should_close: bool,
completion_fn: Box<dyn FnMut(&str) -> Option<Vec<String>>>,
callback_fn: Box<dyn FnMut(&mut Editor, &str)>,
}
impl Prompt {
pub fn new(
prompt: String,
completion_fn: impl FnMut(&str) -> Option<Vec<&str>> + 'static,
completion_fn: impl FnMut(&str) -> Option<Vec<String>> + 'static,
callback_fn: impl FnMut(&mut Editor, &str) + 'static,
) -> Prompt {
Prompt {
prompt,
line: String::new(),
cursor: 0,
completion: None,
should_close: false,
completion_fn: Box::new(completion_fn),
callback_fn: Box::new(callback_fn),
}
@ -65,7 +69,7 @@ pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) {
} => self.insert_char(c),
KeyEvent {
code: KeyCode::Esc, ..
} => unimplemented!("Exit prompt!"),
} => self.should_close = true,
KeyEvent {
code: KeyCode::Right,
..
@ -93,9 +97,8 @@ pub fn handle_input(&mut self, key_event: KeyEvent, editor: &mut Editor) {
KeyEvent {
code: KeyCode::Tab, ..
} => {
let _completion = (self.completion_fn)(&self.line);
self.completion = (self.completion_fn)(&self.line);
}
_ => (),
}
}