picocli fish completion: fixed root options

remkop · Feb 25, 2023 · 2f75728 · 2f75728
1 parent 1b90553
commit 2f75728
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/picocli/AutoComplete.java b/src/main/java/picocli/AutoComplete.java
@@ -549,6 +549,7 @@ public static String fish(String scriptName, CommandLine commandLine) {
         for (CommandDescriptor descriptor : hierarchy) {
             if (descriptor.parentFunctionName.equals("")) {
                 rootDescriptor = descriptor;
+                parentFunction = descriptor.functionName;
                 continue;
             }
             if (!descriptor.parentFunctionName.equals(parentFunction)) {

diff --git a/src/test/dejagnu.fishtests/completion/picocompletion-demo.exp b/src/test/dejagnu.fishtests/completion/picocompletion-demo.exp
@@ -19,7 +19,7 @@ run_completion_test $cmd $test $candidates
 # set test "Tab should not show completions for '${cmd}'"
 
 # there is completion from root level
-# set cmd "picocompletion-demo sub1 -"
-# set test "Tab should show sub1 options for '${cmd}'"
-# set candidates "-h  --candidates  --candidates=  (with candidates)  --num  (a number)  --version"
-# run_completion_test $cmd $test $candidates
+set cmd "picocompletion-demo sub1 -"
+set test "Tab should show sub1 options for '${cmd}'"
+set candidates "--candidates.*--candidates=.*--num.*--str.*"
+run_completion_test $cmd $test $candidates
diff --git a/src/test/resources/picocompletion-demo_completion.fish b/src/test/resources/picocompletion-demo_completion.fish
@@ -1,11 +1,8 @@
 
-# root completion
-set -l root
-complete -c picocompletion-demo --condition "not __fish_seen_subcommand_from $root" --long-option version --short-option V -d ''
-complete -c picocompletion-demo --condition "not __fish_seen_subcommand_from $root" --long-option help --short-option h -d ''
-
 # _picocli_picocompletion_demo completion
 set -l _picocli_picocompletion_demo sub1 sub1-alias sub2 sub2-alias
+complete -c picocompletion-demo --condition "not __fish_seen_subcommand_from $_picocli_picocompletion_demo" --long-option version --short-option V -d ''
+complete -c picocompletion-demo --condition "not __fish_seen_subcommand_from $_picocli_picocompletion_demo" --long-option help --short-option h -d ''
 complete -c picocompletion-demo --no-files --condition "not __fish_seen_subcommand_from $_picocli_picocompletion_demo" --arguments sub1 -d 'First level subcommand 1'
 complete -c picocompletion-demo --condition "__fish_seen_subcommand_from sub1" --long-option num -d 'a number'
 complete -c picocompletion-demo --condition "__fish_seen_subcommand_from sub1" --long-option str -d 'a String'