git.iko.soy/helix
on master help sign in
changed fn to fnmut
commit267602328c0c164136244517bbf7176f4c729c67 authorJan Hrastnik <jan.hrastnik2@gmail.com> dateThu 15 Oct 2020, 12:14 (6 years ago) parentfa55b1e
2 files changed+7−7
compare with master
unifiedsplit
helix-term/src/editor.rs+5−5 helix-view/src/prompt.rs+2−2
helix-term/src/editor.rs+5−5
@@ -66,7 +66,7 @@ impl Editor {
6666 Ok(editor)
6767 }
6868
69− pub fn set_commands(self) {
69+ pub fn set_prompt(self) {
7070 let commands = |input: &str| match input {
7171 "q" => self.should_close = true,
7272 _ => (),
@@ -265,7 +265,7 @@ impl Editor {
265265 // render buffer text
266266 let buffer_string;
267267 if view.state.mode == Mode::Command {
268− buffer_string = &self.prompt.buffer;
268+ buffer_string = &self.prompt.unwrap().buffer;
269269 self.surface
270270 .set_string(1, self.size.1 - 1, String::from(":"), text_color);
271271 self.surface
@@ -291,7 +291,7 @@ impl Editor {
291291 mode => write!(stdout, "\x1B[2 q"),
292292 };
293293 if view.state.mode() == Mode::Command {
294− pos = Position::new(self.size.0 as usize, 2 + self.prompt.cursor_loc);
294+ pos = Position::new(self.size.0 as usize, 2 + self.prompt.unwrap().cursor_loc);
295295 } else {
296296 if let Some(path) = view.state.path() {
297297 self.surface
@@ -314,7 +314,7 @@ impl Editor {
314314 let mut reader = EventStream::new();
315315 let keymap = keymap::default();
316316
317− self.set_commands();
317+ self.set_prompt();
318318 self.render();
319319
320320 loop {
@@ -357,7 +357,7 @@ impl Editor {
357357 view.ensure_cursor_in_view();
358358 }
359359 Mode::Command => {
360− self.prompt.handle_input(event, view);
360+ self.prompt.unwrap().handle_input(event, view);
361361 }
362362 mode => {
363363 if let Some(command) = keymap[&mode].get(&keys) {
helix-view/src/prompt.rs+2−2
@@ -7,13 +7,13 @@ pub struct Prompt {
77 pub buffer: String,
88 pub cursor_loc: usize,
99 completion_fn: Box<dyn FnMut(&str) -> Option<Vec<&str>>>,
10− callback_fn: Box<dyn Fn(&str)>,
10+ callback_fn: Box<dyn FnMut(&str)>,
1111}
1212
1313impl Prompt {
1414 pub fn new(
1515 completion_fn: impl FnMut(&str) -> Option<Vec<&str>> + 'static,
16− callback_fn: impl Fn(&str) + 'static,
16+ callback_fn: impl FnMut(&str) + 'static,
1717 ) -> Prompt {
1818 Prompt {
1919 buffer: String::from(""),