From 0d3485974ce97c5417e71a71df4c80e01e5c888f Mon Sep 17 00:00:00 2001
From: Willem Wyndham <willem@ahalabs.dev>
Date: Fri, 1 Nov 2024 09:43:30 -0400
Subject: [PATCH] feat: add help headings for global command options

Adds Options (Global)" heading to global options.
---
 cmd/soroban-cli/src/commands/global.rs | 12 ++++++------
 cmd/soroban-cli/src/commands/mod.rs    |  1 +
 cmd/soroban-cli/src/config/locator.rs  |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/soroban-cli/src/commands/global.rs b/cmd/soroban-cli/src/commands/global.rs
index be883b6fd..02c0b3b58 100644
--- a/cmd/soroban-cli/src/commands/global.rs
+++ b/cmd/soroban-cli/src/commands/global.rs
@@ -4,7 +4,7 @@ use clap::{
 };
 use std::path::PathBuf;
 
-use super::config;
+use super::{config, HEADING_GLOBAL};
 
 const USAGE_STYLES: Styles = Styles::styled()
     .header(AnsiColor::Green.on_default().effects(Effects::BOLD))
@@ -24,19 +24,19 @@ pub struct Args {
     pub locator: config::locator::Args,
 
     /// Filter logs output. To turn on `stellar_cli::log::footprint=debug` or off `=off`. Can also use env var `RUST_LOG`.
-    #[arg(long, short = 'f', global = true)]
+    #[arg(long, short = 'f', global = true, help_heading = HEADING_GLOBAL)]
     pub filter_logs: Vec<String>,
 
     /// Do not write logs to stderr including `INFO`
-    #[arg(long, short = 'q', global = true)]
+    #[arg(long, short = 'q', global = true, help_heading = HEADING_GLOBAL)]
     pub quiet: bool,
 
     /// Log DEBUG events
-    #[arg(long, short = 'v', global = true)]
+    #[arg(long, short = 'v', global = true, help_heading = HEADING_GLOBAL)]
     pub verbose: bool,
 
     /// Log DEBUG and TRACE events
-    #[arg(long, visible_alias = "vv", global = true)]
+    #[arg(long, visible_alias = "vv", global = true, help_heading = HEADING_GLOBAL)]
     pub very_verbose: bool,
 
     /// List installed plugins. E.g. `stellar-hello`
@@ -44,7 +44,7 @@ pub struct Args {
     pub list: bool,
 
     /// Do not cache your simulations and transactions
-    #[arg(long, env = "STELLAR_NO_CACHE", global = true)]
+    #[arg(long, env = "STELLAR_NO_CACHE", global = true, help_heading = HEADING_GLOBAL)]
     pub no_cache: bool,
 }
 
diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs
index 0a1d4629b..a6a85e816 100644
--- a/cmd/soroban-cli/src/commands/mod.rs
+++ b/cmd/soroban-cli/src/commands/mod.rs
@@ -20,6 +20,7 @@ pub mod version;
 pub mod txn_result;
 
 pub const HEADING_RPC: &str = "Options (RPC)";
+pub const HEADING_GLOBAL: &str = "Options (Global)";
 const ABOUT: &str =
     "Work seamlessly with Stellar accounts, contracts, and assets from the command line.
 
diff --git a/cmd/soroban-cli/src/config/locator.rs b/cmd/soroban-cli/src/config/locator.rs
index 70b4f75f8..0a13c4cc3 100644
--- a/cmd/soroban-cli/src/config/locator.rs
+++ b/cmd/soroban-cli/src/config/locator.rs
@@ -12,7 +12,7 @@ use std::{
 };
 use stellar_strkey::{Contract, DecodeError};
 
-use crate::{utils::find_config_dir, Pwd};
+use crate::{commands::HEADING_GLOBAL, utils::find_config_dir, Pwd};
 
 use super::{
     alias,
@@ -82,11 +82,11 @@ pub enum Error {
 #[group(skip)]
 pub struct Args {
     /// Use global config
-    #[arg(long, global = true)]
+    #[arg(long, global = true, help_heading = HEADING_GLOBAL)]
     pub global: bool,
 
     /// Location of config directory, default is "."
-    #[arg(long, global = true)]
+    #[arg(long, global = true, help_heading = HEADING_GLOBAL)]
     pub config_dir: Option<PathBuf>,
 }