From ad05d1624b1d460297616a99b4e6fed2c38c7751 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 19 Sep 2022 09:05:44 -0500
Subject: [PATCH 1/2] fix(help: Be more precise on literal vs not

---
 src/builder/styled_str.rs | 32 ++++++++++++++++++++++++++++++++
 src/output/help.rs        | 26 ++++++++++++++------------
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/builder/styled_str.rs b/src/builder/styled_str.rs
index 61aad469d1d..503bf333747 100644
--- a/src/builder/styled_str.rs
+++ b/src/builder/styled_str.rs
@@ -219,6 +219,24 @@ impl From<&'_ &'static str> for StyledStr {
     }
 }
 
+impl PartialOrd for StyledStr {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for StyledStr {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.iter().map(cmp_key).cmp(other.iter().map(cmp_key))
+    }
+}
+
+fn cmp_key(c: (Option<Style>, &str)) -> (Option<usize>, &str) {
+    let style = c.0.map(|s| s.as_usize());
+    let content = c.1;
+    (style, content)
+}
+
 /// Color-unaware printing. Never uses coloring.
 impl std::fmt::Display for StyledStr {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
@@ -240,3 +258,17 @@ pub(crate) enum Style {
     Error,
     Hint,
 }
+
+impl Style {
+    fn as_usize(&self) -> usize {
+        match self {
+            Self::Header => 0,
+            Self::Literal => 1,
+            Self::Placeholder => 2,
+            Self::Good => 3,
+            Self::Warning => 4,
+            Self::Error => 5,
+            Self::Hint => 6,
+        }
+    }
+}
diff --git a/src/output/help.rs b/src/output/help.rs
index c69920f1647..fd7292ceb9a 100644
--- a/src/output/help.rs
+++ b/src/output/help.rs
@@ -1,7 +1,6 @@
 // Std
 use std::borrow::Cow;
 use std::cmp;
-use std::fmt::Write as _;
 use std::usize;
 
 // Internal
@@ -816,16 +815,18 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> {
             .get_subcommands()
             .filter(|subcommand| should_show_subcommand(subcommand))
         {
-            let mut sc_str = String::new();
-            sc_str.push_str(subcommand.get_name());
+            let mut styled = StyledStr::new();
+            styled.literal(subcommand.get_name());
             if let Some(short) = subcommand.get_short_flag() {
-                write!(sc_str, " -{}", short).unwrap();
+                styled.none(" ");
+                styled.literal(format!("-{}", short));
             }
             if let Some(long) = subcommand.get_long_flag() {
-                write!(sc_str, " --{}", long).unwrap();
+                styled.none(" ");
+                styled.literal(format!("--{}", long));
             }
-            longest = longest.max(display_width(&sc_str));
-            ord_v.push((subcommand.get_display_order(), sc_str, subcommand));
+            longest = longest.max(styled.display_width());
+            ord_v.push((subcommand.get_display_order(), styled, subcommand));
         }
         ord_v.sort_by(|a, b| (a.0, &a.1).cmp(&(b.0, &b.1)));
 
@@ -834,7 +835,7 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> {
         let next_line_help = self.will_subcommands_wrap(cmd.get_subcommands(), longest);
 
         let mut first = true;
-        for (_, sc_str, sc) in &ord_v {
+        for (_, sc_str, sc) in ord_v {
             if first {
                 first = false;
             } else {
@@ -861,7 +862,7 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> {
 
     fn write_subcommand(
         &mut self,
-        sc_str: &str,
+        sc_str: StyledStr,
         cmd: &Command,
         next_line_help: bool,
         longest: usize,
@@ -921,11 +922,12 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> {
     }
 
     /// Writes subcommand to the wrapped stream.
-    fn subcmd(&mut self, sc_str: &str, next_line_help: bool, longest: usize) {
+    fn subcmd(&mut self, sc_str: StyledStr, next_line_help: bool, longest: usize) {
+        let width = sc_str.display_width();
+
         self.none(TAB);
-        self.literal(sc_str);
+        self.writer.extend(sc_str.into_iter());
         if !next_line_help {
-            let width = display_width(sc_str);
             self.spaces(width.max(longest + TAB_WIDTH) - width);
         }
     }

From e9f1287b639ddb5a05107f9c1662b69af195e521 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 19 Sep 2022 09:07:37 -0500
Subject: [PATCH 2/2] fix(help): Separate command flags like options

Fixes #4232
---
 examples/pacman.md | 6 +++---
 src/output/help.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/pacman.md b/examples/pacman.md
index f75ac172d7f..73ec86fafa1 100644
--- a/examples/pacman.md
+++ b/examples/pacman.md
@@ -40,9 +40,9 @@ package manager utility
 Usage: pacman[EXE] <COMMAND>
 
 Commands:
-  query -Q --query  Query the package database.
-  sync -S --sync    Synchronize packages.
-  help              Print this message or the help of the given subcommand(s)
+  query, -Q, --query  Query the package database.
+  sync, -S, --sync    Synchronize packages.
+  help                Print this message or the help of the given subcommand(s)
 
 Options:
   -h, --help     Print help information
diff --git a/src/output/help.rs b/src/output/help.rs
index fd7292ceb9a..f20ccc9e21f 100644
--- a/src/output/help.rs
+++ b/src/output/help.rs
@@ -818,11 +818,11 @@ impl<'cmd, 'writer> Help<'cmd, 'writer> {
             let mut styled = StyledStr::new();
             styled.literal(subcommand.get_name());
             if let Some(short) = subcommand.get_short_flag() {
-                styled.none(" ");
+                styled.none(", ");
                 styled.literal(format!("-{}", short));
             }
             if let Some(long) = subcommand.get_long_flag() {
-                styled.none(" ");
+                styled.none(", ");
                 styled.literal(format!("--{}", long));
             }
             longest = longest.max(styled.display_width());