[remkop#1388] Fix subcommand aliases autocomplete regression

NewbieOrange · Sep 11, 2021 · d60e418 · d60e418
1 parent 5a95ec3
commit d60e418
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java
@@ -560,7 +560,7 @@ private static void generateFunctionCallsToArrContains(StringBuilder buff,
             int count = functionCalls.size();
             CommandSpec spec = descriptor.commandLine.getCommandSpec();
             String full = spec.qualifiedName(" ");
-            String withoutTopLevelCommand = full.substring(spec.root().name().length() + 1);
+            String withoutTopLevelCommand = full.substring(spec.root().name().length() + 1).replace(spec.name(), descriptor.commandName);
 
             functionCalls.add(format("  if CompWordsContainsArray \"${cmds%2$d[@]}\"; then %1$s; return $?; fi\n", descriptor.functionName, count));
             buff.append(      format("  local cmds%2$d=(%1$s)\n", withoutTopLevelCommand, count));

diff --git a/src/test/java/picocli/AutoCompleteTest.java b/src/test/java/picocli/AutoCompleteTest.java
@@ -1896,4 +1896,35 @@ public void testIssue1352_SubcommandNameResourceBundle() throws FileNotFoundExce
         }
     }
 
+    @CommandLine.Command(name = "aliases", aliases = {"a"})
+    static class Issue1388AliasesCommand {}
+
+    @CommandLine.Command(name = "aliases-parent", subcommands = {Issue1388AliasesCommand.class})
+    static class Issue1388AliasesParentCommand {}
+
+    @Test
+    public void testIssue1388_AliasesCommand() throws FileNotFoundException {
+        File existingScript = new File("aliases-parent_completion");
+        if (existingScript.exists()) {
+            assertTrue(existingScript.delete());
+        }
+        try {
+            AutoComplete.main(Issue1388AliasesParentCommand.class.getName());
+
+            assertEquals("", systemErrRule.getLog());
+            assertEquals("", systemOutRule.getLog());
+
+            assertTrue("Expected file '" + existingScript.getAbsolutePath() + "' to exist",
+                    existingScript.exists());
+
+            Scanner scanner = new Scanner(existingScript);
+            scanner.useDelimiter("\\Z"); // end of file
+            String script = scanner.next();
+            scanner.close();
+            assertThat(script, containsString("local cmds0=(aliases)"));
+            assertThat(script, containsString("local cmds1=(a)"));
+        } finally {
+            existingScript.delete();
+        }
+    }
 }