From e276fc420b97def3b8cd652d3d257fd206c666d0 Mon Sep 17 00:00:00 2001
From: Lzu Tao <taolzu@gmail.com>
Date: Sun, 7 Jul 2024 00:26:53 +0700
Subject: [PATCH] fix: Fix conditions to generate helpers

Both should be met.
---
 clap_complete/src/shells/fish.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/clap_complete/src/shells/fish.rs b/clap_complete/src/shells/fish.rs
index 2ae8a6ed4c9..65f49b73409 100644
--- a/clap_complete/src/shells/fish.rs
+++ b/clap_complete/src/shells/fish.rs
@@ -29,7 +29,7 @@ impl Generator for Fish {
         let name = escape_name(bin_name);
         let mut needs_fn_name = &format!("__fish_{name}_needs_command")[..];
         let mut using_fn_name = &format!("__fish_{name}_using_subcommand")[..];
-        if has_global_flags {
+        if has_global_flags && cmd.has_subcommands() {
             gen_subcommand_helpers(&name, cmd, buf, needs_fn_name, using_fn_name);
         } else {
             needs_fn_name = "__fish_use_subcommand";
@@ -215,9 +215,6 @@ fn gen_subcommand_helpers(
     needs_fn_name: &str,
     using_fn_name: &str,
 ) {
-    if !cmd.has_subcommands() {
-        return;
-    }
     let mut optspecs = String::new();
     let cmd_opts = cmd.get_arguments().filter(|a| !a.is_positional());
     for option in cmd_opts {