git.iko.soy/helix
on master help sign in
Show "Invalid regex" message on enter (Validate) (#3049)
57dc5fbA-Walrus
helix-term/src/ui/mod.rs+33−1
compare with master
unifiedsplit
@@ -12,6 +12,8 @@ mod spinner;
12mod statusline;
12mod statusline;
13mod text;
13mod text;
14
14
15+use crate::compositor::{Component, Compositor};
16+use crate::job;
15pub use completion::Completion;
17pub use completion::Completion;
16pub use editor::EditorView;
18pub use editor::EditorView;
17pub use markdown::Markdown;
19pub use markdown::Markdown;
@@ -110,7 +112,37 @@ pub fn regex_prompt(
110
112
111 view.ensure_cursor_in_view(doc, config.scrolloff);
113 view.ensure_cursor_in_view(doc, config.scrolloff);
112 }
114 }
115+ Err(err) => {
116+ let (view, doc) = current!(cx.editor);
117+ doc.set_selection(view.id, snapshot.clone());
118+ view.offset = offset_snapshot;
119+
120+ if event == PromptEvent::Validate {
121+ let callback = async move {
122+ let call: job::Callback = Box::new(
123+ move |_editor: &mut Editor, compositor: &mut Compositor| {
124+ let contents = Text::new(format!("{}", err));
125+ let size = compositor.size();
126+ let mut popup = Popup::new("invalid-regex", contents)
127+ .position(Some(helix_core::Position::new(
128+ size.height as usize - 2, // 2 = statusline + commandline
129+ 0,
130+ )))
131+ .auto_close(true);
132+ popup.required_size((size.width, size.height));
133+
134+ compositor.replace_or_push("invalid-regex", popup);
135+ },
136+ );
137+ Ok(call)
138+ };
139+
140+ cx.jobs.callback(callback);
141+ } else {
142+ // Update
113− Err(_err) => (), // TODO: mark command line as error
143+ // TODO: mark command line as error
144+ }
145+ }
114 }
146 }
115 }
147 }
116 }
148 }