Merge pull request #378 from pacak/ftu

`fallback_to_usage` fixes related to an `enum` of commands

Author: pacak

Changelog.md

@@ -2,6 +2,11 @@
 
 ## bpaf [0.9.13] - Unreleased
 - You can now use `fallback_to_usage` in derive macro for options and subcommands
+- Bugfixes related to shell completion and file masks
+  thanks @ozwaldorf
+- `not_strict` restriction for positional items (TODO - check the docs)
+  thanks @ozwaldorf
+
 
 ## bpaf [0.9.12] - 2024-04-29
 - better error messages

bpaf_derive/src/top.rs

@@ -507,7 +507,7 @@ impl ParsedEnumBranch {
 
         if let Some(opts_at) = has_options {
             if fallback_usage {
-                attrs.push(EAttr::FallbackUsage);
+                attrs.insert(opts_at, EAttr::FallbackUsage);
             }
 
             if let Some(h) = std::mem::take(&mut help) {

bpaf_derive/src/top_tests.rs

@@ -72,6 +72,32 @@ fn fallback_usage_subcommand() {
     assert_eq!(input.to_token_stream().to_string(), expected.to_string());
 }
 
+#[test]
+fn fallback_usage_lut() {
+    let input: Top = parse_quote! {
+        #[bpaf(options)]
+        enum Lutgen {
+            /// descr
+            #[bpaf(command, fallback_to_usage)]
+            Generate,
+        }
+    };
+
+    let expected = quote! {
+        fn lutgen() -> ::bpaf::OptionParser<Lutgen> {
+            #[allow(unused_imports)]
+            use ::bpaf::Parser;
+            ::bpaf::pure(Lutgen::Generate)
+                .to_options()
+                .descr("descr")
+                .fallback_to_usage()
+                .command("generate")
+                .to_options()
+        }
+    };
+    assert_eq!(input.to_token_stream().to_string(), expected.to_string());
+}
+
 #[test]
 fn top_struct_construct() {
     let top: Top = parse_quote! {