Skip to content

Commit

Permalink
Update 1848 fix to not break testIssue1027RepeatingPositionalParamsWi…
Browse files Browse the repository at this point in the history
…thMinMultiplicity
  • Loading branch information
wtfacoconut authored and remkop committed May 28, 2023
1 parent 4b41a21 commit 9add2af
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/main/java/picocli/CommandLine.java
Expand Up @@ -13025,13 +13025,16 @@ void validate(CommandLine commandLine) {
}

private boolean containsRequiredOptionsOrSubgroups(ArgGroupSpec argGroupSpec) {
return containsRequiredOptions(argGroupSpec) || containsRequiredSubgroups(argGroupSpec);
return containsRequiredOptionsOrParameters(argGroupSpec) || containsRequiredSubgroups(argGroupSpec);
}

private boolean containsRequiredOptions(ArgGroupSpec argGroupSpec) {
private boolean containsRequiredOptionsOrParameters(ArgGroupSpec argGroupSpec) {
for ( OptionSpec option : argGroupSpec.options() ) {
if ( option.required() ) { return true; }
}
for ( PositionalParamSpec param : argGroupSpec.positionalParameters() ){
if( param.required() ){return true;}
}
return false;
}

Expand All @@ -13043,7 +13046,7 @@ private boolean containsRequiredSubgroups(ArgGroupSpec argGroupSpec) {
for ( ArgGroupSpec subsubgroup : subgroup.subgroups() ) {
result &= containsRequiredOptionsOrSubgroups(subsubgroup);
}
return result && containsRequiredOptions(subgroup);
return result && containsRequiredOptionsOrParameters(subgroup);
} else {
return containsRequiredOptionsOrSubgroups(subgroup);
}
Expand Down

0 comments on commit 9add2af

Please sign in to comment.