add register completion (#9936)

pull/9943/head
Kirawi 8 months ago committed by GitHub
parent 1d1806c85a
commit d9de809a57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -2423,6 +2423,14 @@ fn yank_diagnostic(
return Ok(()); 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 (view, doc) = current_ref!(cx.editor);
let primary = doc.selection(view.id).primary(); let primary = doc.selection(view.id).primary();
@ -2438,14 +2446,6 @@ fn yank_diagnostic(
bail!("No diagnostics under primary selection"); 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.registers.write(reg, diag)?;
cx.editor.set_status(format!( cx.editor.set_status(format!(
"Yanked {n} diagnostic{} to register {reg}", "Yanked {n} diagnostic{} to register {reg}",
@ -3045,7 +3045,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
aliases: &[], aliases: &[],
doc: "Clear given register. If no argument is provided, clear all registers.", doc: "Clear given register. If no argument is provided, clear all registers.",
fun: clear_register, fun: clear_register,
signature: CommandSignature::none(), signature: CommandSignature::all(completers::register),
}, },
TypableCommand { TypableCommand {
name: "redraw", name: "redraw",
@ -3066,7 +3066,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
aliases: &[], aliases: &[],
doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default", doc: "Yank diagnostic(s) under primary cursor to register, or clipboard by default",
fun: yank_diagnostic, fun: yank_diagnostic,
signature: CommandSignature::none(), signature: CommandSignature::all(completers::register),
}, },
]; ];

@ -509,4 +509,18 @@ pub mod completers {
files 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()
}
} }

Loading…
Cancel
Save