@@ -297,9 +297,11 @@ pub fn split_selection(cx: &mut Context) {
297297 },
298298 );
299299
300− cx.callback = Some(Box::new(move |compositor: &mut Compositor| {
301− compositor.push(Box::new(prompt));
302− }));
300+ cx.callback = Some(Box::new(
301+ move |compositor: &mut Compositor, editor: &mut Editor| {
302+ compositor.push(Box::new(prompt));
303+ },
304+ ));
303305}
304306
305307pub fn split_selection_on_newline(cx: &mut Context) {
@@ -399,12 +401,13 @@ pub fn append_mode(cx: &mut Context) {
399401
400402// TODO: I, A, o and O can share a lot of the primitives.
401403pub fn command_mode(cx: &mut Context) {
402− cx.callback = Some(Box::new(|compositor: &mut Compositor| {
403− let prompt = Prompt::new(
404− ":".to_owned(),
405− |_input: &str| {
406− // TODO: i need this duplicate list right now to avoid borrow checker issues
407− let command_list = vec![
404+ cx.callback = Some(Box::new(
405+ |compositor: &mut Compositor, editor: &mut Editor| {
406+ let prompt = Prompt::new(
407+ ":".to_owned(),
408+ |_input: &str| {
409+ // TODO: i need this duplicate list right now to avoid borrow checker issues
410+ let command_list = vec![
408411 String::from("q"),
409412 String::from("aaa"),
410413 String::from("bbb"),
@@ -437,37 +440,49 @@ pub fn command_mode(cx: &mut Context) {
437440 String::from("ddd"),
438441 String::from("eee"),
439442 ];
440− command_list
441− .into_iter()
442− .filter(|command| command.contains(_input))
443− .collect()
444− }, // completion
445− |editor: &mut Editor, input: &str, event: PromptEvent| {
446− if event != PromptEvent::Validate {
447− return;
448− }
443+ command_list
444+ .into_iter()
445+ .filter(|command| command.contains(_input))
446+ .collect()
447+ }, // completion
448+ |editor: &mut Editor, input: &str, event: PromptEvent| {
449+ if event != PromptEvent::Validate {
450+ return;
451+ }
449452
450− let parts = input.split_ascii_whitespace().collect::<Vec<&str>>();
453+ let parts = input.split_ascii_whitespace().collect::<Vec<&str>>();
451454
452− match parts.as_slice() {
453− &["q"] => editor.should_close = true,
454− &["o", path] => {
455− // TODO: make view()/view_mut() always contain a view.
456− let size = editor.view().unwrap().size;
457− editor.open(path.into(), size);
455+ match parts.as_slice() {
456+ &["q"] => editor.should_close = true,
457+ &["o", path] => {
458+ // TODO: make view()/view_mut() always contain a view.
459+ let size = editor.view().unwrap().size;
460+ editor.open(path.into(), size);
461+ }
462+ _ => (),
458463 }
459− _ => (),
460− }
461− },
462− );
463− compositor.push(Box::new(prompt));
464− }));
464+ },
465+ );
466+ compositor.push(Box::new(prompt));
467+ },
468+ ));
465469}
466470pub fn file_picker(cx: &mut Context) {
467− cx.callback = Some(Box::new(|compositor: &mut Compositor| {
468− let picker = ui::file_picker("./");
469− compositor.push(Box::new(picker));
470− }));
471+ cx.callback = Some(Box::new(
472+ |compositor: &mut Compositor, editor: &mut Editor| {
473+ let picker = ui::file_picker("./");
474+ compositor.push(Box::new(picker));
475+ },
476+ ));
477+}
478+
479+pub fn buffer_picker(cx: &mut Context) {
480+ cx.callback = Some(Box::new(
481+ |compositor: &mut Compositor, editor: &mut Editor| {
482+ let picker = ui::buffer_picker(&editor.views, editor.focus);
483+ compositor.push(Box::new(picker));
484+ },
485+ ));
471486}
472487
473488// calculate line numbers for each selection range