Respect NO_COLOR and always show the command as a header when paging uv help output

crates/uv/src/commands/help.rs

@@ -6,7 +6,7 @@ use std::{fmt::Display, fmt::Write};
 use anstream::{ColorChoice, stream::IsTerminal};
 use anyhow::{Result, anyhow};
 use clap::CommandFactory;
-use itertools::{Either, Itertools};
+use itertools::Itertools;
 use owo_colors::OwoColorize;
 use which::which;
 
@@ -70,32 +70,29 @@ pub(crate) fn help(query: &[String], printer: Printer, no_pager: bool) -> Result
         .render_long_help()
     };
 
-    let help_ansi = match anstream::Stdout::choice(&std::io::stdout()) {
-        ColorChoice::Always | ColorChoice::AlwaysAnsi => Either::Left(help.ansi()),
-        ColorChoice::Never => Either::Right(help.clone()),
+    let want_color = match anstream::Stdout::choice(&std::io::stdout()) {
+        ColorChoice::Always | ColorChoice::AlwaysAnsi => true,
+        ColorChoice::Never => false,
         // We just asked anstream for a choice, that can't be auto
         ColorChoice::Auto => unreachable!(),
     };
 
     let is_terminal = std::io::stdout().is_terminal();
     let should_page = !no_pager && !is_root && is_terminal;
 
-    if should_page {
-        if let Some(pager) = Pager::try_from_env() {
-            let content = if pager.supports_colors() {
-                help_ansi
-            } else {
-                Either::Right(help.clone())
-            };
-            pager.spawn(
-                format!("{}: {}", "uv help".bold(), query.join(" ")),
-                &content,
-            )?;
+    if should_page && let Some(pager) = Pager::try_from_env() {
+        let query = query.join(" ");
+        if want_color && pager.supports_colors() {
+            pager.spawn(format!("{}: {query}", "uv help".bold()), help.ansi())?;
         } else {
-            writeln!(printer.stdout(), "{help_ansi}")?;
+            pager.spawn(format!("uv help: {query}"), help)?;
         }
     } else {
-        writeln!(printer.stdout(), "{help_ansi}")?;
+        if want_color {
+            writeln!(printer.stdout(), "{}", help.ansi())?;
+        } else {
+            writeln!(printer.stdout(), "{help}")?;
+        }
     }
 
     Ok(ExitStatus::Success)
@@ -131,9 +128,9 @@ struct Pager {
 }
 
 impl PagerKind {
-    fn default_args(&self, prompt: String) -> Vec<String> {
+    fn default_args(&self) -> Vec<String> {
         match self {
-            Self::Less => vec!["-R".to_string(), "-P".to_string(), prompt],
+            Self::Less => vec!["-R".to_string()],
             Self::More => vec![],
             Self::Other(_) => vec![],
         }
@@ -183,7 +180,7 @@ impl FromStr for Pager {
 
 impl Pager {
     /// Display `contents` using the pager.
-    fn spawn(self, prompt: String, contents: impl Display) -> Result<()> {
+    fn spawn(self, heading: String, contents: impl Display) -> Result<()> {
         use std::io::Write;
 
         let command = self
@@ -193,7 +190,7 @@ impl Pager {
             .unwrap_or(OsString::from(self.kind.to_string()));
 
         let args = if self.args.is_empty() {
-            self.kind.default_args(prompt)
+            self.kind.default_args()
         } else {
             self.args
         };
@@ -209,7 +206,10 @@ impl Pager {
             .ok_or_else(|| anyhow!("Failed to take child process stdin"))?;
 
         let contents = contents.to_string();
-        let writer = std::thread::spawn(move || stdin.write_all(contents.as_bytes()));
+        let writer = std::thread::spawn(move || {
+            let _ = write!(stdin, "{heading}\n\n");
+            let _ = stdin.write_all(contents.as_bytes());
+        });
 
         drop(child.wait());
         drop(writer.join());