#178 Fixed autocompletion bug for subcommands in zsh. Autocomplete on…

… zsh would show only the global command options even when a subcommand was specified. Autocompletion now works for nested subcommands. Closes #178
remkop · Aug 28, 2017 · 79e57dd · 79e57dd
1 parent 3bbd94b
commit 79e57dd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,14 @@
 # picocli Release Notes
 
+## 1.0.1 - Bugfix release.
+
+### Summary: zsh autocompletion bugfix
+
+This is the eleventh public release.
+Picocli follows [semantic versioning](http://semver.org/).
+
+- #178 Fixed autocompletion bug for subcommands in zsh. Autocomplete on zsh would show only the global command options even when a subcommand was specified. Autocompletion now works for nested subcommands.
+
 ## 1.0.0 - Bugfix and enhancements release.
 
 ### Summary: command line autocompletion, `-Dkey=value`-like Map options, parser tracing, stricter parsing, bugfixes

diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java
@@ -249,8 +249,8 @@ public boolean equals(Object obj) {
             "  declare -A tmp\n" +
             "  eval lArr1=(\"\\\"\\${$1[@]}\\\"\")\n" +
             "  eval lArr2=(\"\\\"\\${$2[@]}\\\"\")\n" +
-            "  for i in \"${lArr1[@]}\";{ [ -n \"$i\" ] && ((++tmp['$i']));}\n" +
-            "  for i in \"${lArr2[@]}\";{ [ -z \"${tmp[$i]}\" ] && return 1;}\n" +
+            "  for i in \"${lArr1[@]}\";{ [ -n \"$i\" ] && ((++tmp[$i]));}\n" +
+            "  for i in \"${lArr2[@]}\";{ [ -n \"$i\" ] && [ -z \"${tmp[$i]}\" ] && return 1;}\n" +
             "  return 0\n" +
             "}\n" +
             "\n";

diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java
@@ -339,8 +339,8 @@ public void testAutoCompleteAppBothScriptFilesForceOverwrite() throws Exception
                 "  declare -A tmp\n" +
                 "  eval lArr1=(\"\\\"\\${$1[@]}\\\"\")\n" +
                 "  eval lArr2=(\"\\\"\\${$2[@]}\\\"\")\n" +
-                "  for i in \"${lArr1[@]}\";{ [ -n \"$i\" ] && ((++tmp['$i']));}\n" +
-                "  for i in \"${lArr2[@]}\";{ [ -z \"${tmp[$i]}\" ] && return 1;}\n" +
+                "  for i in \"${lArr1[@]}\";{ [ -n \"$i\" ] && ((++tmp[$i]));}\n" +
+                "  for i in \"${lArr2[@]}\";{ [ -n \"$i\" ] && [ -z \"${tmp[$i]}\" ] && return 1;}\n" +
                 "  return 0\n" +
                 "}\n" +
                 "\n" +

diff --git a/src/test/resources/basic.bash b/src/test/resources/basic.bash
@@ -50,8 +50,8 @@ function ArrContains() {
   declare -A tmp
   eval lArr1=("\"\${$1[@]}\"")
   eval lArr2=("\"\${$2[@]}\"")
-  for i in "${lArr1[@]}";{ [ -n "$i" ] && ((++tmp['$i']));}
-  for i in "${lArr2[@]}";{ [ -z "${tmp[$i]}" ] && return 1;}
+  for i in "${lArr1[@]}";{ [ -n "$i" ] && ((++tmp[$i]));}
+  for i in "${lArr2[@]}";{ [ -n "$i" ] && [ -z "${tmp[$i]}" ] && return 1;}
   return 0
 }
 

diff --git a/src/test/resources/picocompletion-demo_completion b/src/test/resources/picocompletion-demo_completion
@@ -50,8 +50,8 @@ function ArrContains() {
   declare -A tmp
   eval lArr1=("\"\${$1[@]}\"")
   eval lArr2=("\"\${$2[@]}\"")
-  for i in "${lArr1[@]}";{ [ -n "$i" ] && ((++tmp['$i']));}
-  for i in "${lArr2[@]}";{ [ -z "${tmp[$i]}" ] && return 1;}
+  for i in "${lArr1[@]}";{ [ -n "$i" ] && ((++tmp[$i]));}
+  for i in "${lArr2[@]}";{ [ -n "$i" ] && [ -z "${tmp[$i]}" ] && return 1;}
   return 0
 }