Fix logical fault of possibly replacing other command names

remkop · Sep 13, 2021 · 3fce00c · 3fce00c
1 parent 06eddec
commit 3fce00c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java
@@ -560,7 +560,8 @@ 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).replace(spec.name(), descriptor.commandName);
+            String withoutTopLevelCommand = full.substring(spec.root().name().length() + 1,
+                    full.length() - spec.name().length()) + 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));