fix(complete): Have consistent order across machines

clap-rs · Sep 4, 2024 · 0436e2a · 0436e2a
1 parent 64e3790
commit 0436e2a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/clap_complete/src/env/shells.rs b/clap_complete/src/env/shells.rs
@@ -362,6 +362,7 @@ function _clap_dynamic_completer() {
         COMPLETER -- ${words} 2>/dev/null \
     )}")
 
+    zstyle ":completion:${curcontext}:*" group-name ''
     if [[ -n $completions ]]; then
         compadd -a completions
     fi

diff --git a/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/zsh/zsh/_exhaustive b/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/zsh/zsh/_exhaustive
@@ -10,6 +10,7 @@ function _clap_dynamic_completer() {
         exhaustive -- ${words} 2>/dev/null \
     )}")
 
+    zstyle ":completion:${curcontext}:*" group-name ''
     if [[ -n $completions ]]; then
         compadd -a completions
     fi

diff --git a/clap_complete/tests/testsuite/zsh.rs b/clap_complete/tests/testsuite/zsh.rs
@@ -185,8 +185,8 @@ fn complete_dynamic_env_toplevel() {
     let input = "exhaustive \t\t";
     let expected = snapbox::str![[r#"
 % exhaustive
---generate  --help      -V          action      help        last        quote       
---global    --version   -h          alias       hint        pacman      value       
+action      --generate  -h          help        last        quote       value       
+alias       --global    --help      hint        pacman      -V          --version   
 "#]];
     let actual = runtime.complete(input, &term).unwrap();
     assert_data_eq!(actual, expected);
@@ -205,10 +205,10 @@ fn complete_dynamic_env_quoted_help() {
     let input = "exhaustive quote \t\t";
     let expected = snapbox::str![[r#"
 % exhaustive quote
---backslash        --double-quotes    --single-quotes    cmd-backslash      cmd-expansions     
---backticks        --expansions       --version          cmd-backticks      cmd-single-quotes  
---brackets         --global           -V                 cmd-brackets       escape-help        
---choice           --help             -h                 cmd-double-quotes  help               
+--backslash        cmd-backslash      cmd-expansions     --expansions       help               
+--backticks        cmd-backticks      cmd-single-quotes  --global           --single-quotes    
+--brackets         cmd-brackets       --double-quotes    -h                 -V                 
+--choice           cmd-double-quotes  escape-help        --help             --version          
 "#]];
     let actual = runtime.complete(input, &term).unwrap();
     assert_data_eq!(actual, expected);