Use: indent.

yassun7010 · Aug 2, 2023 · 572e762 · 572e762
1 parent 8a8aee6
commit 572e762
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/cmdcomp/v2/completion.py b/cmdcomp/v2/completion.py
@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 from typing import Any
 
@@ -12,6 +13,7 @@ def generate_v2(shell: ShellType, config: V2Config) -> str:
     env = Environment(
         loader=FileSystemLoader(Path(__file__).parent / "templates"),
     )
+    env.filters["ident"] = lambda x: re.sub(r"[,.-]", "_", x)
     template = env.get_template(f"{shell.value}.sh.jinja")
 
     return template.render(

diff --git a/cmdcomp/v2/templates/bash.sh.jinja b/cmdcomp/v2/templates/bash.sh.jinja
@@ -1,4 +1,4 @@
-{%- set func_name = "_" + app_name|replace("-","_") -%}
+{%- set func_name = "_" + app_name|ident -%}
 {%- set scope = "" -%}
 
 {#- macro def -#}
@@ -117,7 +117,7 @@ cur=$COMP_CWORD
         cur=$(( cur + opts_cur + 1 ))
         ;;
 {% for (tag, command_name), subcommand in append_key_tag(commands[app_name].subcommands, func_name).items() recursive %}
-      {%- set new_tag = tag + "_" + command_name|replace("-","_") %}
+      {%- set new_tag = tag + "_" + command_name|ident %}
       {{ tag }},{{ command_name }}
 {%- for alias in subcommand.aliases -%}
       |{{ tag }},{{ alias }}
@@ -140,7 +140,7 @@ cur=$COMP_CWORD
       return 0
       ;;
 {% for (tag, command_name), subcommand in append_key_tag(commands[app_name].subcommands, func_name).items() recursive %}
-{%- set new_tag = tag + "_" + command_name|replace("-","_") %}
+{%- set new_tag = tag + "_" + command_name|ident %}
     {{ new_tag }})
       {{ command_completion(subcommand, loop.depth + 1)|indent(6) }}
 

diff --git a/cmdcomp/v2/templates/zsh.sh.jinja b/cmdcomp/v2/templates/zsh.sh.jinja
@@ -1,4 +1,4 @@
-{%- set func_name = "_" + app_name|replace("-","_") -%}
+{%- set func_name = "_" + app_name|ident -%}
 {%- set scope = "" -%}
 
 {#- macro def -#}
@@ -44,8 +44,8 @@
 {%- set scope = scope + "_" + cmd_name %}
     {{ ([cmd_name] + command.aliases)|join("|") }})
 {%- if command.has_subcommands %}
-      local -a _{{ scope|replace("-", "_") }}_subcmds
-      _{{ scope|replace("-", "_") }}_subcmds=(
+      local -a _{{ scope|ident }}_subcmds
+      _{{ scope|ident }}_subcmds=(
 {%- for subcmd_name, subcommand in command.subcommands.items() %}
         {{ candidate(subcmd_name, subcommand) }}'{{ description(subcommand) }}'
 {%- endfor %}
@@ -61,7 +61,7 @@
 {%- if command.has_positional_wildcard_argument %}
         '*{{ contents("*", command.positional_wildcard_argument) }}' \
 {%- elif command.has_subcommands %}
-        '1: :_values "subcommand" ${_{{ scope|replace("-", "_") }}_subcmds[@]}' \
+        '1: :_values "subcommand" ${_{{ scope|ident }}_subcmds[@]}' \
         '*:: :->args' \
 {%- endif %}
         && ret=0