kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

commands: Allow using selected register where hardcoded

Browse source 
These snippets use hardcoded registers but it can be useful to be able
to specify a register for these commands.
This commit is contained in:
Michael Davis 2023-07-10 19:09:26 -05:00 • committed by Blaž Hrastnik
parent baceb02a09
commit a23b70182c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
helix-term/src/commands.rs
View file

@ -1908,9 +1908,10 @@ fn searcher(cx: &mut Context, direction: Direction) {
fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) { fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
let count = cx.count(); let count = cx.count();
let register = cx.register.unwrap_or('/');
let config = cx.editor.config(); let config = cx.editor.config();
let scrolloff = config.scrolloff; let scrolloff = config.scrolloff;
if let Some(query) = cx.editor.registers.last('/', cx.editor) { if let Some(query) = cx.editor.registers.last(register, cx.editor) {
let doc = doc!(cx.editor); let doc = doc!(cx.editor);
let contents = doc.text().slice(..).to_string(); let contents = doc.text().slice(..).to_string();
let search_config = &config.search; let search_config = &config.search;
@ -1960,6 +1961,7 @@ fn extend_search_prev(cx: &mut Context) {
} }
fn search_selection(cx: &mut Context) { fn search_selection(cx: &mut Context) {
let register = cx.register.unwrap_or('/');
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let contents = doc.text().slice(..); let contents = doc.text().slice(..);
@ -1972,15 +1974,16 @@ fn search_selection(cx: &mut Context) {
.collect::<Vec<_>>() .collect::<Vec<_>>()
.join("|"); .join("|");
let msg = format!("register '{}' set to '{}'", '/', &regex); let msg = format!("register '{}' set to '{}'", register, &regex);
match cx.editor.registers.push('/', regex) { match cx.editor.registers.push(register, regex) {
Ok(_) => cx.editor.set_status(msg), Ok(_) => cx.editor.set_status(msg),
Err(err) => cx.editor.set_error(err.to_string()), Err(err) => cx.editor.set_error(err.to_string()),
} }
} }
fn make_search_word_bounded(cx: &mut Context) { fn make_search_word_bounded(cx: &mut Context) {
let regex = match cx.editor.registers.last('/', cx.editor) { let register = cx.register.unwrap_or('/');
let regex = match cx.editor.registers.last(register, cx.editor) {
Some(regex) => regex, Some(regex) => regex,
None => return, None => return,
}; };
@ -2003,8 +2006,8 @@ fn make_search_word_bounded(cx: &mut Context) {
new_regex.push_str("\\b"); new_regex.push_str("\\b");
} }
let msg = format!("register '{}' set to '{}'", '/', &new_regex); let msg = format!("register '{}' set to '{}'", register, &new_regex);
match cx.editor.registers.push('/', new_regex) { match cx.editor.registers.push(register, new_regex) {
Ok(_) => cx.editor.set_status(msg), Ok(_) => cx.editor.set_status(msg),
Err(err) => cx.editor.set_error(err.to_string()), Err(err) => cx.editor.set_error(err.to_string()),
} }