git.iko.soy/helix
on master help sign in
support prefilling prompt (#2459)

* support prefilling prompt * introduce with_line builder method in Prompt * extract show_prompt * use textobject_word as fallback input

commite5c7aaed91c0b3d533a04840fedb88ecabc8f6a8 authorBob <QiBaobin@users.noreply.github.com> dateMon 18 Jul 2022, 09:17 (4 years ago) parent55b45ec
3 files changed+41−2
compare with master
unifiedsplit
helix-term/src/commands/lsp.rs+13−1 helix-term/src/ui/mod.rs+21−1 helix-term/src/ui/prompt.rs+7
helix-term/src/commands/lsp.rs+13−1
@@ -885,9 +885,21 @@ pub fn hover(cx: &mut Context) {
885885}
886886
887887pub fn rename_symbol(cx: &mut Context) {
888− ui::prompt(
888+ let (view, doc) = current_ref!(cx.editor);
889+ let text = doc.text().slice(..);
890+ let primary_selection = doc.selection(view.id).primary();
891+ let prefill = if primary_selection.len() > 1 {
892+ primary_selection
893+ } else {
894+ use helix_core::textobject::{textobject_word, TextObject};
895+ textobject_word(text, primary_selection, TextObject::Inside, 1, false)
896+ }
897+ .fragment(text)
898+ .into();
899+ ui::prompt_with_input(
889900 cx,
890901 "rename-to:".into(),
902+ prefill,
891903 None,
892904 ui::completers::none,
893905 move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
helix-term/src/ui/mod.rs+21−1
@@ -34,7 +34,27 @@ pub fn prompt(
3434 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
3535 callback_fn: impl FnMut(&mut crate::compositor::Context, &str, PromptEvent) + 'static,
3636) {
37− let mut prompt = Prompt::new(prompt, history_register, completion_fn, callback_fn);
37+ show_prompt(
38+ cx,
39+ Prompt::new(prompt, history_register, completion_fn, callback_fn),
40+ );
41+}
42+
43+pub fn prompt_with_input(
44+ cx: &mut crate::commands::Context,
45+ prompt: std::borrow::Cow<'static, str>,
46+ input: String,
47+ history_register: Option<char>,
48+ completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
49+ callback_fn: impl FnMut(&mut crate::compositor::Context, &str, PromptEvent) + 'static,
50+) {
51+ show_prompt(
52+ cx,
53+ Prompt::new(prompt, history_register, completion_fn, callback_fn).with_line(input),
54+ );
55+}
56+
57+fn show_prompt(cx: &mut crate::commands::Context, mut prompt: Prompt) {
3858 // Calculate initial completion
3959 prompt.recalculate_completion(cx.editor);
4060 cx.push_layer(Box::new(prompt));
helix-term/src/ui/prompt.rs+7
@@ -84,6 +84,13 @@ impl Prompt {
8484 }
8585 }
8686
87+ pub fn with_line(mut self, line: String) -> Self {
88+ let cursor = line.len();
89+ self.line = line;
90+ self.cursor = cursor;
91+ self
92+ }
93+
8794 pub fn line(&self) -> &String {
8895 &self.line
8996 }