Skip to content

Commit

Permalink
Optional history for rename_symbol (helix-editor#10932)
Browse files Browse the repository at this point in the history
Fix helix-editor#10560 by accepting an optional history register for the
rename_symbol command.
  • Loading branch information
sebastianpoeplau authored and AOx0 committed Jun 15, 2024
1 parent 6aeb33b commit 9c81f0b
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions helix-term/src/commands/lsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1032,11 +1032,12 @@ pub fn rename_symbol(cx: &mut Context) {
fn create_rename_prompt(
editor: &Editor,
prefill: String,
history_register: Option<char>,
language_server_id: Option<LanguageServerId>,
) -> Box<ui::Prompt> {
let prompt = ui::Prompt::new(
"rename-to:".into(),
None,
history_register,
ui::completers::none,
move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
if event != PromptEvent::Validate {
Expand Down Expand Up @@ -1073,6 +1074,7 @@ pub fn rename_symbol(cx: &mut Context) {
}

let (view, doc) = current_ref!(cx.editor);
let history_register = cx.register;

if doc
.language_servers_with_feature(LanguageServerFeature::RenameSymbol)
Expand Down Expand Up @@ -1115,14 +1117,14 @@ pub fn rename_symbol(cx: &mut Context) {
}
};

let prompt = create_rename_prompt(editor, prefill, Some(ls_id));
let prompt = create_rename_prompt(editor, prefill, history_register, Some(ls_id));

compositor.push(prompt);
},
);
} else {
let prefill = get_prefill_from_word_boundary(cx.editor);
let prompt = create_rename_prompt(cx.editor, prefill, None);
let prompt = create_rename_prompt(cx.editor, prefill, history_register, None);
cx.push_layer(prompt);
}
}
Expand Down

0 comments on commit 9c81f0b

Please sign in to comment.