Skip to content

Commit

Permalink
add register completion (helix-editor#9936)
Browse files Browse the repository at this point in the history
  • Loading branch information
kirawi authored and Vulpesx committed Jun 7, 2024
1 parent 1fb751d commit 5e70b94
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
20 changes: 10 additions & 10 deletions helix-term/src/commands/typed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2423,6 +2423,14 @@ fn yank_diagnostic(
return Ok(());
}

let reg = match args.first() {
Some(s) => {
ensure!(s.chars().count() == 1, format!("Invalid register {s}"));
s.chars().next().unwrap()
}
None => '+',
};

let (view, doc) = current_ref!(cx.editor);
let primary = doc.selection(view.id).primary();

Expand All @@ -2438,14 +2446,6 @@ fn yank_diagnostic(
bail!("No diagnostics under primary selection");
}

let reg = match args.get(0) {
Some(s) => {
ensure!(s.chars().count() == 1, format!("Invalid register {s}"));
s.chars().next().unwrap()
}
None => '+',
};

cx.editor.registers.write(reg, diag)?;
cx.editor.set_status(format!(
"Yanked {n} diagnostic{} to register {reg}",
Expand Down Expand Up @@ -3045,7 +3045,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
aliases: &[],
doc: "Clear given register. If no argument is provided, clear all registers.",
fun: clear_register,
signature: CommandSignature::none(),
signature: CommandSignature::all(completers::register),
},
TypableCommand {
name: "redraw",
Expand All @@ -3066,7 +3066,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
aliases: &[],
doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
fun: yank_diagnostic,
signature: CommandSignature::none(),
signature: CommandSignature::all(completers::register),
},
];

Expand Down
14 changes: 14 additions & 0 deletions helix-term/src/ui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,4 +509,18 @@ pub mod completers {
files
}
}

pub fn register(editor: &Editor, input: &str) -> Vec<Completion> {
let iter = editor
.registers
.iter_preview()
// Exclude special registers that shouldn't be written to
.filter(|(ch, _)| !matches!(ch, '%' | '#' | '.'))
.map(|(ch, _)| ch.to_string());

fuzzy_match(input, iter, false)
.into_iter()
.map(|(name, _)| ((0..), name.into()))
.collect()
}
}

0 comments on commit 5e70b94

Please sign in to comment.