commands: migrate the open/close commands under the "status" command

2 files changed, 34 insertions, 31 deletions

diff --git a/misc/bash_completion/git-bug b/misc/bash_completion/git-bug
index 973eff9c..77e2d350 100644
--- a/misc/bash_completion/git-bug
+++ b/misc/bash_completion/git-bug
@@ -277,26 +277,6 @@ _git-bug_add()
     noun_aliases=()
 }
 
-_git-bug_close()
-{
-    last_command="git-bug_close"
-
-    command_aliases=()
-
-    commands=()
-
-    flags=()
-    two_word_flags=()
-    local_nonpersistent_flags=()
-    flags_with_completion=()
-    flags_completion=()
-
-
-    must_have_one_flag=()
-    must_have_one_noun=()
-    noun_aliases=()
-}
-
 _git-bug_commands()
 {
     last_command="git-bug_commands"
@@ -428,9 +408,9 @@ _git-bug_ls()
     noun_aliases=()
 }
 
-_git-bug_open()
+_git-bug_pull()
 {
-    last_command="git-bug_open"
+    last_command="git-bug_pull"
 
     command_aliases=()
 
@@ -448,9 +428,9 @@ _git-bug_open()
     noun_aliases=()
 }
 
-_git-bug_pull()
+_git-bug_push()
 {
-    last_command="git-bug_pull"
+    last_command="git-bug_push"
 
     command_aliases=()
 
@@ -468,9 +448,9 @@ _git-bug_pull()
     noun_aliases=()
 }
 
-_git-bug_push()
+_git-bug_show()
 {
-    last_command="git-bug_push"
+    last_command="git-bug_show"
 
     command_aliases=()
 
@@ -488,9 +468,29 @@ _git-bug_push()
     noun_aliases=()
 }
 
-_git-bug_show()
+_git-bug_status_close()
 {
-    last_command="git-bug_show"
+    last_command="git-bug_status_close"
+
+    command_aliases=()
+
+    commands=()
+
+    flags=()
+    two_word_flags=()
+    local_nonpersistent_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+
+    must_have_one_flag=()
+    must_have_one_noun=()
+    noun_aliases=()
+}
+
+_git-bug_status_open()
+{
+    last_command="git-bug_status_open"
 
     command_aliases=()
 
@@ -515,6 +515,8 @@ _git-bug_status()
     command_aliases=()
 
     commands=()
+    commands+=("close")
+    commands+=("open")
 
     flags=()
     two_word_flags=()
@@ -623,12 +625,10 @@ _git-bug_root_command()
 
     commands=()
     commands+=("add")
-    commands+=("close")
     commands+=("commands")
     commands+=("comment")
     commands+=("label")
     commands+=("ls")
-    commands+=("open")
     commands+=("pull")
     commands+=("push")
     commands+=("show")
diff --git a/misc/zsh_completion/git-bug b/misc/zsh_completion/git-bug
index 38d72c24..bb22344a 100644
--- a/misc/zsh_completion/git-bug
+++ b/misc/zsh_completion/git-bug
@@ -8,7 +8,7 @@ case $state in
   level1)
     case $words[1] in
       git-bug)
-        _arguments '1: :(add close commands comment label ls open pull push show status termui title webui)'
+        _arguments '1: :(add commands comment label ls pull push show status termui title webui)'
       ;;
       *)
         _arguments '*: :_files'
@@ -20,6 +20,9 @@ case $state in
       comment)
         _arguments '2: :(add)'
       ;;
+      status)
+        _arguments '2: :(close open)'
+      ;;
       title)
         _arguments '2: :(edit)'
       ;;