Skip to content

Commit

Permalink
Show "Invalid regex" message on enter (Validate) (helix-editor#3049)
Browse files Browse the repository at this point in the history
* Show "Invalid regex" message on enter (Validate)

* Reset selection on invalid regex

* Add popup for invalid regex

* Replace set_position with position

* Make popup auto close
  • Loading branch information
A-Walrus authored and pathwave committed Nov 4, 2022
1 parent 67e5fcc commit cd6ce15
Showing 1 changed file with 33 additions and 1 deletion.
34 changes: 33 additions & 1 deletion helix-term/src/ui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ mod spinner;
mod statusline;
mod text;

use crate::compositor::{Component, Compositor};
use crate::job;
pub use completion::Completion;
pub use editor::EditorView;
pub use markdown::Markdown;
Expand Down Expand Up @@ -110,7 +112,37 @@ pub fn regex_prompt(

view.ensure_cursor_in_view(doc, config.scrolloff);
}
Err(_err) => (), // TODO: mark command line as error
Err(err) => {
let (view, doc) = current!(cx.editor);
doc.set_selection(view.id, snapshot.clone());
view.offset = offset_snapshot;

if event == PromptEvent::Validate {
let callback = async move {
let call: job::Callback = Box::new(
move |_editor: &mut Editor, compositor: &mut Compositor| {
let contents = Text::new(format!("{}", err));
let size = compositor.size();
let mut popup = Popup::new("invalid-regex", contents)
.position(Some(helix_core::Position::new(
size.height as usize - 2, // 2 = statusline + commandline
0,
)))
.auto_close(true);
popup.required_size((size.width, size.height));

compositor.replace_or_push("invalid-regex", popup);
},
);
Ok(call)
};

cx.jobs.callback(callback);
} else {
// Update
// TODO: mark command line as error
}
}
}
}
}
Expand Down

0 comments on commit cd6ce15

Please sign in to comment.