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

changed fn to fnmut

This commit is contained in:
Jan Hrastnik 2020-10-15 12:14:54 +02:00 committed by Blaž Hrastnik
parent fa55b1e51c
commit 267602328c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helix-term/src/editor.rs
View File

@ -66,7 +66,7 @@ pub fn new(mut args: Args) -> Result<Self, Error> {
Ok(editor)
}
pub fn set_commands(self) {
pub fn set_prompt(self) {
let commands = |input: &str| match input {
"q" => self.should_close = true,
_ => (),
@ -265,7 +265,7 @@ pub fn render_prompt(&mut self, text_color: Style) {
// render buffer text
let buffer_string;
if view.state.mode == Mode::Command {
buffer_string = &self.prompt.buffer;
buffer_string = &self.prompt.unwrap().buffer;
self.surface
.set_string(1, self.size.1 - 1, String::from(":"), text_color);
self.surface
@ -291,7 +291,7 @@ pub fn render_cursor(&mut self, viewport: Rect, text_color: Style) {
mode => write!(stdout, "\x1B[2 q"),
};
if view.state.mode() == Mode::Command {
pos = Position::new(self.size.0 as usize, 2 + self.prompt.cursor_loc);
pos = Position::new(self.size.0 as usize, 2 + self.prompt.unwrap().cursor_loc);
} else {
if let Some(path) = view.state.path() {
self.surface
@ -314,7 +314,7 @@ pub async fn event_loop(&mut self) {
let mut reader = EventStream::new();
let keymap = keymap::default();
self.set_commands();
self.set_prompt();
self.render();
loop {
@ -357,7 +357,7 @@ pub async fn event_loop(&mut self) {
view.ensure_cursor_in_view();
}
Mode::Command => {
self.prompt.handle_input(event, view);
self.prompt.unwrap().handle_input(event, view);
}
mode => {
if let Some(command) = keymap[&mode].get(&keys) {

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

@ -7,13 +7,13 @@ pub struct Prompt {
pub buffer: String,
pub cursor_loc: usize,
completion_fn: Box<dyn FnMut(&str) -> Option<Vec<&str>>>,
callback_fn: Box<dyn Fn(&str)>,
callback_fn: Box<dyn FnMut(&str)>,
}
impl Prompt {
pub fn new(
completion_fn: impl FnMut(&str) -> Option<Vec<&str>> + 'static,
callback_fn: impl Fn(&str) + 'static,
callback_fn: impl FnMut(&str) + 'static,
) -> Prompt {
Prompt {
buffer: String::from(""),