Merge pull request #5893 from 8LWXpg/patch-2

epage · web-flow · commit cf15d48b59cf · 2025-01-27T09:22:40.000-06:00
fix(complete): Check if help string is empty
diff --git a/clap_complete/src/aot/shells/powershell.rs b/clap_complete/src/aot/shells/powershell.rs
@@ -63,10 +63,13 @@ fn escape_string(string: &str) -> String {
 }
 
 fn escape_help<T: ToString>(help: Option<&StyledStr>, data: T) -> String {
-    match help {
-        Some(help) => escape_string(&help.to_string().replace('\n', " ")),
-        _ => data.to_string(),
+    if let Some(help) = help {
+        let help_str = help.to_string();
+        if !help_str.is_empty() {
+            return escape_string(&help_str.replace('\n', " "));
+        }
     }
+    data.to_string()
 }
 
 fn generate_inner(p: &Command, previous_command_name: &str) -> String {

Original file line number	Diff line number	Diff line change
`@@ -63,10 +63,13 @@ fn escape_string(string: &str) -> String {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`fn escape_help<T: ToString>(help: Option<&StyledStr>, data: T) -> String {`
`66`		`- match help {`
`67`		`- Some(help) => escape_string(&help.to_string().replace('\n', " ")),`
`68`		`- _ => data.to_string(),`
	`66`	`+ if let Some(help) = help {`
	`67`	`+ let help_str = help.to_string();`
	`68`	`+ if !help_str.is_empty() {`
	`69`	`+ return escape_string(&help_str.replace('\n', " "));`
	`70`	`+ }`
`69`	`71`	`}`
	`72`	`+ data.to_string()`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`fn generate_inner(p: &Command, previous_command_name: &str) -> String {`