andrey/helix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prompt: make the callback a FnOnce.

Browse Source
This commit is contained in:
Blaž Hrastnik 2020-12-15 19:07:25 +09:00
parent 2bfdcede32
commit 1a843b6c06
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
helix-term/src/commands.rs
View File

@ -262,24 +262,23 @@ pub fn split_selection(cx: &mut Context) {
// # update state // # update state
// } // }
cx.callback = Some(Box::new(|compositor: &mut Compositor| { let prompt = Prompt::new(
let prompt = Prompt::new( "split:".to_string(),
"split:".to_string(), |input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate
|input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate |editor: &mut Editor, input: &str| {
|editor: &mut Editor, input: &str| { match Regex::new(input) {
match Regex::new(input) { Ok(regex) => {
Ok(regex) => { let view = editor.view_mut().unwrap();
let view = editor.view_mut().unwrap(); let text = &view.doc.text().slice(..);
let text = &view.doc.text().slice(..); let selection = selection::split_on_matches(text, view.doc.selection(), &regex);
let selection = view.doc.set_selection(selection);
selection::split_on_matches(text, view.doc.selection(), &regex);
view.doc.set_selection(selection);
}
Err(_) => (), // TODO: mark command line as error
} }
}, Err(_) => (), // TODO: mark command line as error
); }
},
);
cx.callback = Some(Box::new(move |compositor: &mut Compositor| {
compositor.push(Box::new(prompt)); compositor.push(Box::new(prompt));
})); }));
} }

2
helix-term/src/compositor.rs
View File

@ -19,7 +19,7 @@
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use tui::layout::Rect; use tui::layout::Rect;
pub type Callback = Box<dyn Fn(&mut Compositor)>; pub type Callback = Box<dyn FnOnce(&mut Compositor)>;
// --> EventResult should have a callback that takes a context with methods like .popup(), // --> EventResult should have a callback that takes a context with methods like .popup(),
// .prompt() etc. That way we can abstract it from the renderer. // .prompt() etc. That way we can abstract it from the renderer.