Update: template.

Author: ya7010

cmdcomp/v2/templates/bash.sh.jinja

@@ -35,14 +35,18 @@ cmd_cur=$(( cmd_cur + 1 ))
 {#- macro def -#}
 {%- macro command_completion(command, depth) -%}
 {% if command.has_subcommands -%}
-opts="{{ (command.subcommand_names_with_alias + command.keyword_names_with_alias)|join(' ') }}"
-if [[ ${COMP_CWORD} -eq {{ depth }} ]] ; then
+if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+  opts="{{ command.keyword_names_with_alias|join(' ') }}"
+  COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
+  return 0
+elif [ $cur -eq $COMP_CWORD ] ; then
+  opts="{{ command.subcommand_names_with_alias|join(' ') }}"
   COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
   return 0
 fi
 {%- elif command.has_positional_arguments or command.has_positional_wildcard_argument -%}
-opts="{{ command.keyword_names_with_alias|join(' ') }}"
 if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+  opts="{{ command.keyword_names_with_alias|join(' ') }}"
   COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
   return 0
 fi
@@ -84,24 +88,25 @@ case $(( COMP_CWORD - cmd_cur + 1)) in
     ;;
 {% endif -%}
 esac
-{%- endif -%}
+{%- endif %}
 {%- endmacro -%}
 
 #!/bin/bash
 
 {{ func_name }}() {
-  local word cur cmd cmd_cur opts
+  local word cmd opts cur cmd_cur opts_cur
   COMPREPLY=()
-  cur=0
-  cmd_cur=0
   cmd=""
   opts=""
+  cur=0
+  cmd_cur=0
+  opts_cur=0
 
   for word in ${COMP_WORDS[@]}; do
     case "${cmd},${word}" in
       ",$1")
         cmd="{{ func_name }}"
-        cur=$(( cur + 1 ))
+        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("-","_") %}
@@ -110,11 +115,12 @@ esac
       |{{ tag }},{{ alias }}
 {%- endfor -%})
         cmd="{{ new_tag }}"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 {{ loop(append_key_tag(subcommand.subcommands, new_tag).items()) -}}
 {% endfor %}
       *)
+        opts_cur=$(( opts_cur + 1 ))
         ;;
     esac
   done

samples/v2/output.bash

@@ -1,54 +1,60 @@
 #!/bin/bash
 
 _cliname() {
-  local word cur cmd cmd_cur opts
+  local word cmd opts cur cmd_cur opts_cur
   COMPREPLY=()
-  cur=0
-  cmd_cur=0
   cmd=""
   opts=""
+  cur=0
+  cmd_cur=0
+  opts_cur=0
 
   for word in ${COMP_WORDS[@]}; do
     case "${cmd},${word}" in
       ",$1")
         cmd="_cliname"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       _cliname,list|_cliname,ls)
         cmd="_cliname_list"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       _cliname,cd)
         cmd="_cliname_cd"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       _cliname,test)
         cmd="_cliname_test"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       _cliname_test,rubocop)
         cmd="_cliname_test_rubocop"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       _cliname_test,pytest)
         cmd="_cliname_test_pytest"
-        cur=$(( cur + 1 ))
+        cur=$(( cur + opts_cur + 1 ))
         ;;
 
       *)
+        opts_cur=$(( opts_cur + 1 ))
         ;;
     esac
   done
 
   case "${cmd}" in
     _cliname)
-      opts="list ls cd test --verbose --no-verbose --version -V --config --help"
-      if [[ ${COMP_CWORD} -eq 1 ]] ; then
+      if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+        opts="--verbose --no-verbose --version -V --config --help"
+        COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
+        return 0
+      elif [ $cur -eq $COMP_CWORD ] ; then
+        opts="list ls cd test"
         COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
         return 0
       fi
@@ -93,8 +99,8 @@ _cliname() {
       ;;
 
     _cliname_list)
-      opts="--all -a"
       if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+        opts="--all -a"
         COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
         return 0
       fi
@@ -130,8 +136,8 @@ _cliname() {
       ;;
 
     _cliname_cd)
-      opts="-P"
       if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+        opts="-P"
         COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
         return 0
       fi
@@ -166,8 +172,12 @@ _cliname() {
       ;;
 
     _cliname_test)
-      opts="rubocop pytest"
-      if [[ ${COMP_CWORD} -eq 2 ]] ; then
+      if [[ ${COMP_WORDS[COMP_CWORD]} == -* ]] ; then
+        opts=""
+        COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
+        return 0
+      elif [ $cur -eq $COMP_CWORD ] ; then
+        opts="rubocop pytest"
         COMPREPLY=( $(compgen -W "${opts}" -- "${COMP_WORDS[COMP_CWORD]}") )
         return 0
       fi