From 0f4e7d51a71c9cfcdc21b358f62e4e268542f781 Mon Sep 17 00:00:00 2001
From: FroVolod <frol_off@meta.ua>
Date: Fri, 15 Sep 2023 13:34:47 +0300
Subject: [PATCH] fixed unnamed_args/args_without_attrs conflict

---
 interactive-clap-derive/src/derives/to_cli_args/mod.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/interactive-clap-derive/src/derives/to_cli_args/mod.rs b/interactive-clap-derive/src/derives/to_cli_args/mod.rs
index b960d7a..c936ce8 100644
--- a/interactive-clap-derive/src/derives/to_cli_args/mod.rs
+++ b/interactive-clap-derive/src/derives/to_cli_args/mod.rs
@@ -25,7 +25,9 @@ pub fn impl_to_cli_args(ast: &syn::DeriveInput) -> TokenStream {
                 } else {
                     args_subcommand
                 };
-                if let Some(args_without_attrs) =
+                if let Some(unnamed_args) = interactive_clap_attrs_cli_field.unnamed_args {
+                    args_push_front_vec.push(unnamed_args)
+                } else if let Some(args_without_attrs) =
                     interactive_clap_attrs_cli_field.args_without_attrs
                 {
                     args_push_front_vec.push(args_without_attrs)
@@ -33,9 +35,6 @@ pub fn impl_to_cli_args(ast: &syn::DeriveInput) -> TokenStream {
                 if let Some(named_args) = interactive_clap_attrs_cli_field.named_args {
                     args_push_front_vec.push(named_args)
                 };
-                if let Some(unnamed_args) = interactive_clap_attrs_cli_field.unnamed_args {
-                    args_push_front_vec.push(unnamed_args)
-                };
             }
             let args_push_front_vec = args_push_front_vec.into_iter().rev();