Handle inter-expansion top-level args properly

CHANGELOG.md

@@ -1,3 +1,8 @@
+# [Upcoming]
+
+* Top level `#structopt[...]` raw methods on inner atructs/enums now work as expected
+  ([#151](https://github.com/TeXitoi/structopt/issues/151)) ([#289](https://github.com/TeXitoi/structopt/issues/289)).
+
 # v0.3.5 (2019-11-22)
 
 * `try_from_str` functions are now called with a `&str` instead of a `&String` ([#282](https://github.com/TeXitoi/structopt/pull/282))

structopt-derive/src/lib.rs

@@ -207,7 +207,9 @@ fn gen_augmentation(
         }
     });
 
+    let app_methods = parent_attribute.top_level_methods();
     quote! {{
+        let #app_var = #app_var#app_methods;
         #( #args )*
         #subcmd
         #app_var
@@ -361,9 +363,7 @@ fn gen_clap(attrs: &[Attribute]) -> GenOutput {
     );
     let tokens = {
         let name = attrs.cased_name();
-        let methods = attrs.top_level_methods();
-
-        quote!(::structopt::clap::App::new(#name)#methods)
+        quote!(::structopt::clap::App::new(#name))
     };
 
     GenOutput { tokens, attrs }
@@ -463,11 +463,13 @@ fn gen_augment_clap_enum(
         }
     });
 
+    let app_methods = parent_attribute.top_level_methods();
+
     quote! {
         pub fn augment_clap<'a, 'b>(
             app: ::structopt::clap::App<'a, 'b>
         ) -> ::structopt::clap::App<'a, 'b> {
-            app #( #subcommands )*
+            app #app_methods #( #subcommands )*
         }
     }
 }

tests/issues.rs

@@ -0,0 +1,49 @@
+// https://github.com/TeXitoi/structopt/issues/151
+// https://github.com/TeXitoi/structopt/issues/289
+
+#[test]
+fn issue_151() {
+    use structopt::{clap::ArgGroup, StructOpt};
+
+    #[derive(StructOpt, Debug)]
+    #[structopt(group = ArgGroup::with_name("verb").required(true).multiple(true))]
+    struct Opt {
+        #[structopt(long, group = "verb")] foo: bool,
+        #[structopt(long, group = "verb")] bar: bool,
+    }
+
+    #[derive(Debug, StructOpt)]
+    struct Cli {
+        #[structopt(flatten)]
+        a: Opt
+    }
+
+    assert!(Cli::clap().get_matches_from_safe(&["test"]).is_err());
+    assert!(Cli::clap().get_matches_from_safe(&["test", "--foo"]).is_ok());
+    assert!(Cli::clap().get_matches_from_safe(&["test", "--bar"]).is_ok());
+    assert!(Cli::clap().get_matches_from_safe(&["test", "--zebra"]).is_err());
+}
+
+#[test]
+fn issue_289() {
+
+    use structopt::{StructOpt, clap::AppSettings};
+
+    #[derive(StructOpt)]
+    #[structopt(setting = AppSettings::InferSubcommands)]
+    enum Args {
+        SomeCommand(SubSubCommand),
+        AnotherCommand,
+    }
+
+    #[derive(StructOpt)]
+    #[structopt(setting = AppSettings::InferSubcommands)]
+    enum SubSubCommand {
+        TestCommand,
+    }
+
+    assert!(Args::clap().get_matches_from_safe(&["test", "some-command",  "test-command"]).is_ok());
+    assert!(Args::clap().get_matches_from_safe(&["test", "some", "test-command"]).is_ok());
+    assert!(Args::clap().get_matches_from_safe(&["test", "some-command", "test"]).is_ok());
+    assert!(Args::clap().get_matches_from_safe(&["test", "some", "test"]).is_ok());
+}