[#969] Reorganized code a little bit to facilitate (hopefully) comple…

…tion support for nested sub-subcommands; simplify code
remkop · Mar 21, 2020 · 953d52c · 953d52c
1 parent ca65357
commit 953d52c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/picocli-shell-jline3/src/main/java/picocli/shell/jline3/PicocliCommands.java b/picocli-shell-jline3/src/main/java/picocli/shell/jline3/PicocliCommands.java
@@ -79,9 +79,10 @@ public SystemCompleter compileCompleters() {
 
     private SystemCompleter compileCompleters(SystemCompleter completer, CommandLine cmd) {
         completer.addAliases(extractAliases(cmd));
-        for (String name : cmd.getCommandSpec().subcommands().keySet()) {
-            CommandSpec sub = cmd.getSubcommands().get(name).getCommandSpec();
-            registerCompleters(completer, name, sub);
+
+        for (Map.Entry<String, CommandLine> entry : cmd.getSubcommands().entrySet()) {
+            CommandSpec sub = entry.getValue().getCommandSpec();
+            registerCompleters(completer, entry.getKey(), sub);
 
             // TODO support nested sub-subcommands (https://github.com/remkop/picocli/issues/969)
             //   Is the below sufficient?