From bcce0fcdcf12768094a59e1c70dfb21de43b9d19 Mon Sep 17 00:00:00 2001
From: Paul Ouellette <oue.paul18@gmail.com>
Date: Tue, 11 Jun 2019 17:22:27 -0400
Subject: [PATCH] Small improvements to bash completions

---
 spec/completion_spec.lua | 32 +++++++---------------
 src/argparse.lua         | 58 ++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/spec/completion_spec.lua b/spec/completion_spec.lua
index 15c8013..5299fd3 100644
--- a/spec/completion_spec.lua
+++ b/spec/completion_spec.lua
@@ -13,8 +13,7 @@ _foo() {
     cmd="foo"
     opts="-h --help"
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
@@ -41,8 +40,7 @@ _foo() {
             ;;
     esac
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
@@ -70,8 +68,7 @@ _foo() {
             ;;
     esac
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
@@ -92,8 +89,7 @@ _foo() {
     cmd="foo"
     opts=""
 
-    for arg in ${COMP_WORDS[@]:1}
-    do
+    for arg in ${COMP_WORDS[@]:1}; do
         case "$arg" in
             install)
                 cmd="install"
@@ -106,11 +102,9 @@ _foo() {
         foo)
             COMPREPLY=($(compgen -W "install" -- "$cur"))
             ;;
-
     esac
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
@@ -132,8 +126,7 @@ _foo() {
     cmd="foo"
     opts=""
 
-    for arg in ${COMP_WORDS[@]:1}
-    do
+    for arg in ${COMP_WORDS[@]:1}; do
         case "$arg" in
             install)
                 cmd="install"
@@ -151,8 +144,7 @@ _foo() {
             ;;
     esac
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
@@ -174,12 +166,8 @@ _foo() {
     cmd="foo"
     opts=""
 
-    for arg in ${COMP_WORDS[@]:1}
-    do
+    for arg in ${COMP_WORDS[@]:1}; do
         case "$arg" in
-            help)
-                break
-                ;;
             install)
                 cmd="install"
                 break
@@ -191,11 +179,9 @@ _foo() {
         foo)
             COMPREPLY=($(compgen -W "help install" -- "$cur"))
             ;;
-
     esac
 
-    if [[ "$cur" = -* ]]
-    then
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
     fi
 }
diff --git a/src/argparse.lua b/src/argparse.lua
index cdc55bf..6f92a07 100644
--- a/src/argparse.lua
+++ b/src/argparse.lua
@@ -1144,7 +1144,7 @@ function Parser:_bash_option_args(buf, indent)
             compreply = ('COMPREPLY=($(compgen -W "%s" -- "$cur"))')
                :format(table.concat(option._choices, " "))
          else
-            compreply = ('COMPREPLY=($(compgen -f "$cur"))')
+            compreply = 'COMPREPLY=($(compgen -f "$cur"))'
          end
          table.insert(opts, (" "):rep(indent + 4) .. pattern)
          table.insert(opts, (" "):rep(indent + 8) .. compreply)
@@ -1163,23 +1163,21 @@ end
 function Parser:_bash_get_cmd(buf)
    local cmds = {}
    for idx, command in ipairs(self._commands) do
-      table.insert(cmds, (" "):rep(12) .. ("%s)"):format(table.concat(command._aliases, "|")))
       if idx ~= self._help_command_idx then
+         table.insert(cmds, (" "):rep(12) .. ("%s)"):format(table.concat(command._aliases, "|")))
          table.insert(cmds, (" "):rep(16) .. ('cmd="%s"'):format(command._aliases[1]))
+         table.insert(cmds, (" "):rep(16) .. "break")
+         table.insert(cmds, (" "):rep(16) .. ";;")
       end
-      table.insert(cmds, (" "):rep(16) .. "break")
-      table.insert(cmds, (" "):rep(16) .. ";;")
    end
 
-   local get_cmd = ([[
-    for arg in ${COMP_WORDS[@]:1}
-    do
-        case "$arg" in
-%s
-        esac
-    done
-]]):format(table.concat(cmds, "\n"))
-   table.insert(buf, get_cmd)
+   if #cmds > 0 then
+      table.insert(buf, (" "):rep(4) .. "for arg in ${COMP_WORDS[@]:1}; do")
+      table.insert(buf, (" "):rep(8) .. 'case "$arg" in')
+      table.insert(buf, table.concat(cmds, "\n"))
+      table.insert(buf, (" "):rep(8) .. "esac")
+      table.insert(buf, (" "):rep(4) .. "done\n")
+   end
 end
 
 function Parser:_bash_cmd_completions(buf)
@@ -1193,15 +1191,14 @@ function Parser:_bash_cmd_completions(buf)
       end
    end
 
-   local cmd_completions = ([[
-    case "$cmd" in
-        %s)
-            COMPREPLY=($(compgen -W "%s" -- "$cur"))
-            ;;
-%s
-    esac
-]]):format(self._name, get_commands(self), table.concat(subcmds, "\n"))
-   table.insert(buf, cmd_completions)
+   table.insert(buf, (" "):rep(4) .. 'case "$cmd" in')
+   table.insert(buf, (" "):rep(8) .. self._name .. ")")
+   table.insert(buf, (" "):rep(12) .. ('COMPREPLY=($(compgen -W "%s" -- "$cur"))'):format(get_commands(self)))
+   table.insert(buf, (" "):rep(12) .. ";;")
+   if #subcmds > 0 then
+      table.insert(buf, table.concat(subcmds, "\n"))
+   end
+   table.insert(buf, (" "):rep(4) .. "esac\n")
 end
 
 function Parser:get_bash_complete()
@@ -1215,21 +1212,18 @@ _%s() {
 ]]):format(self._name, self._name, get_options(self))}
 
    self:_bash_option_args(buf, 4)
-
+   self:_bash_get_cmd(buf)
    if #self._commands > 0 then
-      self:_bash_get_cmd(buf)
       self:_bash_cmd_completions(buf)
    end
 
-   table.insert(buf, [=[
-    if [[ "$cur" = -* ]]
-    then
+   table.insert(buf, ([=[
+    if [[ "$cur" = -* ]]; then
         COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-    fi]=])
-   table.insert(buf, "}\n")
-   local complete = ("complete -F _%s -o bashdefault -o default %s")
-      :format(self._name, self._name)
-   table.insert(buf, complete)
+    fi
+}
+
+complete -F _%s -o bashdefault -o default %s]=]):format(self._name, self._name))
 
    return table.concat(buf, "\n")
 end