Merge pull request #369 from matthiasbeyer/clap-generate-shellcompletion

Add subcommand to generate completions, remove build.rs
zellij-org · Apr 25, 2021 · d89e3e9 · d89e3e9
2 parents b3eb9f1 + 4942968
commit d89e3e9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 247 deletions.
diff --git a/assets/completions/_zellij b/assets/completions/_zellij
diff --git a/assets/completions/zellij.bash b/assets/completions/zellij.bash
diff --git a/assets/completions/zellij.fish b/assets/completions/zellij.fish
diff --git a/build.rs b/build.rs
diff --git a/src/cli.rs b/src/cli.rs
@@ -51,4 +51,7 @@ pub enum ConfigCli {
         /// Disables loading of configuration file at default location
         clean: bool,
     },
+
+    #[structopt(name = "generate-completion")]
+    GenerateCompletion { shell: String },
 }
diff --git a/src/main.rs b/src/main.rs
@@ -45,6 +45,20 @@ pub fn main() {
         let mut stream = UnixStream::connect(ZELLIJ_IPC_PIPE).unwrap();
         let api_command = bincode::serialize(&ApiCommand::OpenFile(file_to_open)).unwrap();
         stream.write_all(&api_command).unwrap();
+    } else if let Some(crate::cli::ConfigCli::GenerateCompletion { shell }) = opts.option {
+        let shell = match shell.as_ref() {
+            "bash" => structopt::clap::Shell::Bash,
+            "fish" => structopt::clap::Shell::Fish,
+            "zsh" => structopt::clap::Shell::Zsh,
+            "powerShell" => structopt::clap::Shell::PowerShell,
+            "elvish" => structopt::clap::Shell::Elvish,
+            other => {
+                eprintln!("Unsupported shell: {}", other);
+                std::process::exit(1);
+            }
+        };
+        let mut out = std::io::stdout();
+        CliArgs::clap().gen_completions_to("zellij", shell, &mut out);
     } else {
         let os_input = get_os_input();
         atomic_create_dir(ZELLIJ_TMP_DIR).unwrap();