Skip to content

Extra subcommand print #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 27, 2024
Merged

Extra subcommand print #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
400f921
an extra group name was being printed with the help output when using…
phlptp Jul 27, 2024
f39c6ce
clean up if conditional and update pre-commit
phlptp Jul 27, 2024
a432843
style: pre-commit.ci fixes
pre-commit-ci[bot] Jul 27, 2024
8a1fd31
update macos pipeline builds
phlptp Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repos:
- id: debug-statements

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.6
rev: v18.1.8
hooks:
- id: clang-format
types_or: [c++, c, cuda]
Expand Down
11 changes: 7 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,17 @@ jobs:
Linux14PC:
vmImage: "ubuntu-latest"
cli11.precompile: ON
macOS20:
vmImage: "macOS-14"
cli11.std: 20
macOS17:
vmImage: "macOS-12"
vmImage: "macOS-13"
cli11.std: 17
macOS11:
vmImage: "macOS-11"
vmImage: "macOS-12"
cli11.std: 11
macOS11PC:
vmImage: "macOS-11"
macOS12PC:
vmImage: "macOS-12"
cli11.std: 11
cli11.precompile: ON
Windows17:
Expand Down
6 changes: 3 additions & 3 deletions include/CLI/impl/Formatter_inl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ CLI11_INLINE std::string Formatter::make_subcommands(const App *app, AppFormatMo
std::vector<std::string> subcmd_groups_seen;
for(const App *com : subcommands) {
if(com->get_name().empty()) {
if(com->get_group().empty() || com->get_group().front() == '+') {
continue;
if(!com->get_group().empty() && com->get_group().front() != '+') {
out << make_expanded(com);
}
out << make_expanded(com);
continue;
}
std::string group_key = com->get_group();
if(!group_key.empty() &&
Expand Down
29 changes: 29 additions & 0 deletions tests/HelpTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,35 @@ TEST_CASE("THelp: HiddenGroup", "[help]") {
CHECK_THAT(help, Contains("another"));
}

// from https://github.com/CLIUtils/CLI11/issues/1045
TEST_CASE("THelp: multiple_group", "[help]") {
CLI::App app{"test_group"};
auto *group1 = app.add_option_group("outGroup");
auto *group2 = app.add_option_group("inGroup");

std::string outFile("");
group1->add_option("--outfile,-o", outFile, "specify the file location of the output")->required();

std::string inFile("");
group2->add_option("--infile,-i", inFile, "specify the file location of the input")->required();

auto help = app.help();
int inCount = 0;
int outCount = 0;
auto iFind = help.find("inGroup");
while(iFind != std::string::npos) {
++inCount;
iFind = help.find("inGroup", iFind + 6);
}
auto oFind = help.find("outGroup");
while(oFind != std::string::npos) {
++outCount;
oFind = help.find("outGroup", oFind + 6);
}
CHECK(inCount == 1);
CHECK(outCount == 1);
}

TEST_CASE("THelp: OptionalPositionalAndOptions", "[help]") {
CLI::App app{"My prog", "AnotherProgram"};
app.add_flag("-q,--quick");
Expand Down