Merge pull request #5310 from epage/pty

chore(complete): Update completest-pty
clap-rs · Jan 15, 2024 · b250c0b · b250c0b
2 parents f524d84 + c742b8e
commit b250c0b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml
@@ -46,7 +46,7 @@ snapbox = { version = "0.4.15", features = ["diff", "path", "examples"] }
 # Cutting out `filesystem` feature
 trycmd = { version = "0.14.19", default-features = false, features = ["color-auto", "diff", "examples"] }
 completest = "0.4.0"
-completest-pty = "0.4.0"
+completest-pty = "0.5.0"
 clap = { path = "../", version = "4.0.0", default-features = false, features = ["std", "derive", "help"] }
 
 [[example]]

diff --git a/clap_complete/tests/testsuite/bash.rs b/clap_complete/tests/testsuite/bash.rs
@@ -156,9 +156,9 @@ fn complete() {
         common::load_runtime::<completest_pty::BashRuntimeBuilder>("static", "exhaustive");
 
     let input = "exhaustive \t\t";
-    let expected = r#"%
--h          --global    --help      action      value       last        hint        help
--V          --generate  --version   quote       pacman      alias       complete"#;
+    let expected = r#"% 
+-h          --global    --help      action      value       last        hint        help        
+-V          --generate  --version   quote       pacman      alias       complete    "#;
     let actual = runtime.complete(input, &term).unwrap();
     snapbox::assert_eq(expected, actual);
 }

diff --git a/clap_complete/tests/testsuite/elvish.rs b/clap_complete/tests/testsuite/elvish.rs
@@ -139,21 +139,22 @@ fn complete() {
 
     let input = "exhaustive \t";
     let expected = r#"% exhaustive --generate
---generate     generate
---global       everywhere
---help         Print help
---version      Print version
--V             Print version
--h             Print help
-action         action
-alias          alias
-complete       Register shell completions for this program
+ COMPLETING argument  
+--generate     generate                                                 
+--global       everywhere                                               
+--help         Print help                                               
+--version      Print version                                            
+-V             Print version                                            
+-h             Print help                                               
+action         action                                                   
+alias          alias                                                    
+complete       Register shell completions for this program              
 help           Print this message or the help of the given subcommand(s)
-hint           hint
-last           last
-pacman         pacman
-quote          quote
-value          value"#;
+hint           hint                                                     
+last           last                                                     
+pacman         pacman                                                   
+quote          quote                                                    
+value          value                                                    "#;
     let actual = runtime.complete(input, &term).unwrap();
     snapbox::assert_eq(expected, actual);
 }
diff --git a/clap_complete/tests/testsuite/fish.rs b/clap_complete/tests/testsuite/fish.rs
@@ -138,15 +138,15 @@ fn complete() {
         common::load_runtime::<completest_pty::FishRuntimeBuilder>("static", "exhaustive");
 
     let input = "exhaustive \t";
-    let expected = r#"% exhaustive
+    let expected = r#"% exhaustive 
 action  complete            (Register shell completions for this program)  hint  pacman  value
-alias   help  (Print this message or the help of the given subcommand(s))  last  quote"#;
+alias   help  (Print this message or the help of the given subcommand(s))  last  quote   "#;
     let actual = runtime.complete(input, &term).unwrap();
     snapbox::assert_eq(expected, actual);
 
     let input = "exhaustive quote --choice \t";
     let actual = runtime.complete(input, &term).unwrap();
-    let expected = r#"% exhaustive quote --choice
+    let expected = r#"% exhaustive quote --choice 
 bash  (bash (shell))  fish  (fish shell)  zsh  (zsh shell)"#;
     snapbox::assert_eq(expected, actual);
 }

diff --git a/clap_complete/tests/testsuite/zsh.rs b/clap_complete/tests/testsuite/zsh.rs
@@ -139,9 +139,9 @@ fn complete() {
 
     let input = "exhaustive \t";
     let expected = r#"% exhaustive
-complete                                           -- Register shell completions for this program
-help                                               -- Print this message or the help of the given subcommand(s)
-pacman    action  alias  value  quote  hint  last  --"#;
+complete                                           -- Register shell completions for this program                     
+help                                               -- Print this message or the help of the given subcommand(s)       
+pacman    action  alias  value  quote  hint  last  --                                                                 "#;
     let actual = runtime.complete(input, &term).unwrap();
     snapbox::assert_eq(expected, actual);
 }