fix(parser): Override required when parent group has conflict

Fixes clap-rs#4569
epage · Dec 22, 2022 · 85ecb3e · 85ecb3e
1 parent d145b8b
commit 85ecb3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/parser/validator.rs b/src/parser/validator.rs
@@ -371,8 +371,17 @@ impl<'cmd> Validator<'cmd> {
 
     fn is_missing_required_ok(&self, a: &Arg, conflicts: &Conflicts) -> bool {
         debug!("Validator::is_missing_required_ok: {}", a.get_id());
-        let conflicts = conflicts.gather_conflicts(self.cmd, a.get_id());
-        !conflicts.is_empty()
+        if !conflicts.gather_conflicts(self.cmd, a.get_id()).is_empty() {
+            debug!("Validator::is_missing_required_ok: true (self)");
+            return true;
+        }
+        for group_id in self.cmd.groups_for_arg(a.get_id()) {
+            if !conflicts.gather_conflicts(self.cmd, &group_id).is_empty() {
+                debug!("Validator::is_missing_required_ok: true ({})", group_id);
+                return true;
+            }
+        }
+        false
     }
 
     // Failing a required unless means, the arg's "unless" wasn't present, and neither were they

diff --git a/tests/builder/conflicts.rs b/tests/builder/conflicts.rs
@@ -259,7 +259,9 @@ fn arg_conflicts_with_group_with_required_memeber() {
     }
 
     let result = cmd.try_get_matches_from_mut(vec!["myprog", "--flag"]);
-    assert!(result.is_err());
+    if let Err(err) = result {
+        panic!("{}", err);
+    }
 }
 
 #[test]