Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-11-14 00:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor(complete): Isolate all CommandCompleter knowledge

Browse source
This commit is contained in:
Ed Page 2024-08-10 20:34:20 -05:00
parent d064946c60
commit 2b2b2be610
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clap_complete/src/dynamic/shells/command.rs
View file

@ -262,7 +262,7 @@ pub trait CommandCompleter {
impl CommandCompleter for Shell { impl CommandCompleter for Shell {
fn file_name(&self, name: &str) -> String { fn file_name(&self, name: &str) -> String {
self.completer().file_name(name) shell_completer(self).file_name(name)
} }
fn write_registration( fn write_registration(
&self, &self,
@ -271,8 +271,7 @@ impl CommandCompleter for Shell {
completer: &str, completer: &str,
buf: &mut dyn std::io::Write, buf: &mut dyn std::io::Write,
) -> Result<(), std::io::Error> { ) -> Result<(), std::io::Error> {
self.completer() shell_completer(self).write_registration(name, bin, completer, buf)
.write_registration(name, bin, completer, buf)
} }
fn write_complete( fn write_complete(
&self, &self,
@ -281,7 +280,17 @@ impl CommandCompleter for Shell {
current_dir: Option<&std::path::Path>, current_dir: Option<&std::path::Path>,
buf: &mut dyn std::io::Write, buf: &mut dyn std::io::Write,
) -> Result<(), std::io::Error> { ) -> Result<(), std::io::Error> {
self.completer().write_complete(cmd, args, current_dir, buf) shell_completer(self).write_complete(cmd, args, current_dir, buf)
}
}
fn shell_completer(shell: &Shell) -> &dyn CommandCompleter {
match shell {
Shell::Bash => &super::Bash,
Shell::Elvish => &super::Elvish,
Shell::Fish => &super::Fish,
Shell::Powershell => &super::Powershell,
Shell::Zsh => &super::Zsh,
} }
} }

12
clap_complete/src/dynamic/shells/mod.rs
View file

@ -132,18 +132,6 @@ impl ValueEnum for Shell {
} }
} }
impl Shell {
fn completer(&self) -> &dyn CommandCompleter {
match self {
Self::Bash => &Bash,
Self::Elvish => &Elvish,
Self::Fish => &Fish,
Self::Powershell => &Powershell,
Self::Zsh => &Zsh,
}
}
}
/// A [`CommandCompleter`] for Bash /// A [`CommandCompleter`] for Bash
#[derive(Copy, Clone, PartialEq, Eq, Debug)] #[derive(Copy, Clone, PartialEq, Eq, Debug)]
pub struct Bash; pub struct Bash;