refactor(complete): Pull out subcommand separator

Author: epage

clap_complete/src/aot/shells/bash.rs

@@ -96,9 +96,9 @@ fn all_subcommands(cmd: &Command, parent_fn_name: &str) -> String {
         subcmds: &mut Vec<(String, String, String)>,
     ) {
         let fn_name = format!(
-            "{parent_fn_name}__{cmd_name}",
+            "{parent_fn_name}{CMD_SEP}{cmd_name}",
             parent_fn_name = parent_fn_name,
-            cmd_name = cmd.get_name().to_string().replace('-', "__")
+            cmd_name = cmd.get_name().to_string().replace('-', CMD_SEP)
         );
         subcmds.push((
             parent_fn_name.to_string(),
@@ -140,7 +140,7 @@ fn subcommand_details(cmd: &Command) -> String {
     let mut subcmd_dets = vec![String::new()];
     let mut scs = utils::all_subcommands(cmd)
         .iter()
-        .map(|x| x.1.replace(' ', "__"))
+        .map(|x| x.1.replace(' ', CMD_SEP))
         .collect::<Vec<_>>();
 
     scs.sort();
@@ -162,9 +162,9 @@ fn subcommand_details(cmd: &Command) -> String {
             COMPREPLY=( $(compgen -W \"${{opts}}\" -- \"${{cur}}\") )
             return 0
             ;;",
-            subcmd = sc.replace('-', "__"),
+            subcmd = sc.replace('-', CMD_SEP),
             sc_opts = all_options_for_path(cmd, sc),
-            level = sc.split("__").map(|_| 1).sum::<u64>(),
+            level = sc.split(CMD_SEP).map(|_| 1).sum::<u64>(),
             opts_details = option_details_for_path(cmd, sc)
         )
     }));
@@ -175,7 +175,7 @@ fn subcommand_details(cmd: &Command) -> String {
 fn option_details_for_path(cmd: &Command, path: &str) -> String {
     debug!("option_details_for_path: path={path}");
 
-    let p = utils::find_subcommand_with_path(cmd, path.split("__").skip(1).collect());
+    let p = utils::find_subcommand_with_path(cmd, path.split(CMD_SEP).skip(1).collect());
     let mut opts = vec![String::new()];
 
     for o in p.get_opts() {
@@ -280,7 +280,7 @@ fn vals_for(o: &Arg) -> String {
 fn all_options_for_path(cmd: &Command, path: &str) -> String {
     debug!("all_options_for_path: path={path}");
 
-    let p = utils::find_subcommand_with_path(cmd, path.split("__").skip(1).collect());
+    let p = utils::find_subcommand_with_path(cmd, path.split(CMD_SEP).skip(1).collect());
 
     let mut opts = String::new();
     for short in utils::shorts_and_visible_aliases(p) {
@@ -306,3 +306,5 @@ fn all_options_for_path(cmd: &Command, path: &str) -> String {
 
     opts
 }
+
+const CMD_SEP: &str = "__";

clap_complete/src/aot/shells/zsh.rs

@@ -105,7 +105,7 @@ _{bin_name_underscore}_commands() {{
     local commands; commands=({subcommands_and_args})
     _describe -t commands '{bin_name} commands' commands \"$@\"
 }}",
-        bin_name_underscore = bin_name.replace(' ', "__"),
+        bin_name_underscore = bin_name.replace(' ', CMD_SEP),
         bin_name = bin_name,
         subcommands_and_args = subcommands_of(p)
     );
@@ -130,7 +130,7 @@ _{bin_name_underscore}_commands() {{
     local commands; commands=({subcommands_and_args})
     _describe -t commands '{bin_name} commands' commands \"$@\"
 }}",
-            bin_name_underscore = bin_name.replace(' ', "__"),
+            bin_name_underscore = bin_name.replace(' ', CMD_SEP),
             bin_name = bin_name,
             subcommands_and_args =
                 subcommands_of(parser_of(p, bin_name).expect(INTERNAL_ERROR_MSG))
@@ -347,7 +347,7 @@ fn get_args_of(parent: &Command, p_global: Option<&Command>) -> String {
             .expect("crate::generate should have set the bin_name");
         let subcommand_bin_name = format!(
             "\":: :_{name}_commands\" \\",
-            name = parent_bin_name.replace(' ', "__")
+            name = parent_bin_name.replace(' ', CMD_SEP)
         );
         segments.push(subcommand_bin_name);
 
@@ -678,6 +678,8 @@ fn write_positionals_of(p: &Command) -> String {
     ret.join("\n")
 }
 
+const CMD_SEP: &str = "__";
+
 #[cfg(test)]
 mod tests {
     use super::{escape_help, escape_value};