Merge branch 'main' into footer_header_formatting_disable

Author: phlptp

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
       - id: debug-statements
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v20.1.0
+    rev: v20.1.3
     hooks:
       - id: clang-format
         types_or: [c++, c, cuda]

include/CLI/App.hpp

@@ -733,6 +733,9 @@ class App {
         auto *ptr = option_group.get();
         // move to App_p for overload resolution on older gcc versions
         App_p app_ptr = std::dynamic_pointer_cast<App>(option_group);
+        // don't inherit the footer in option groups and clear the help flag by default
+        app_ptr->footer_ = "";
+        app_ptr->set_help_flag();
         add_subcommand(std::move(app_ptr));
         return ptr;
     }

include/CLI/impl/Config_inl.hpp

@@ -549,7 +549,9 @@ ConfigBase::to_config(const App *app, bool default_also, bool write_description,
                 bool isDefault = false;
                 if(value.empty() && default_also) {
                     if(!opt->get_default_str().empty()) {
-                        value = detail::convert_arg_for_ini(opt->get_default_str(), stringQuote, literalQuote, false);
+                        results_t res;
+                        opt->results(res);
+                        value = detail::ini_join(res, arraySeparator, arrayStart, arrayEnd, stringQuote, literalQuote);
                     } else if(opt->get_expected_min() == 0) {
                         value = "false";
                     } else if(opt->get_run_callback_for_default() || !opt->get_required()) {

include/CLI/impl/Option_inl.hpp

@@ -686,7 +686,8 @@ CLI11_INLINE int Option::_add_result(std::string &&result, std::vector<std::stri
         }
     }
 
-    if((allow_extra_args_ || get_expected_max() > 1) && !result.empty() && result.front() == '[' &&
+    if((allow_extra_args_ || get_expected_max() > 1 || get_type_size() > 1) && !result.empty() &&
+       result.front() == '[' &&
        result.back() == ']') {  // this is now a vector string likely from the default or user entry
 
         result.pop_back();

tests/ConfigFileTest.cpp

@@ -14,6 +14,8 @@
 #include <tuple>
 #include <vector>
 
+#include <array>
+
 TEST_CASE("StringBased: convert_arg_for_ini", "[config]") {
 
     CHECK("\"\"" == CLI::detail::convert_arg_for_ini(std::string{}));
@@ -4114,3 +4116,20 @@ TEST_CASE_METHOD(TApp, "RoundTripEmptyVector", "[config]") {
     app.parse_from_stream(out);
     CHECK(cv.empty());
 }
+
+TEST_CASE_METHOD(TApp, "RoundTripArrayFloat", "[config]") {
+    std::array<float, 2> cv{-1.0F, 1.0F};
+    app.add_option("-c", cv)->capture_default_str();
+
+    args = {};
+
+    run();
+    std::string configOut = app.config_to_str(true, true);
+    app.clear();
+    std::stringstream out(configOut);
+    cv[0] = -3.0F;
+    cv[1] = 4.0F;
+    app.parse_from_stream(out);
+    CHECK(cv[0] == -1.0F);
+    CHECK(cv[1] == 1.0F);
+}

tests/HelpTest.cpp

@@ -85,6 +85,25 @@ TEST_CASE("THelp: FooterCallbackBoth", "[help]") {
     CHECK_THAT(help, Contains("foot!!!!"));
 }
 
+/// @brief from github issue #1156
+TEST_CASE("THelp: FooterOptionGroup", "[help]") {
+    CLI::App app{"My prog"};
+
+    app.footer("Report bugs to [email protected]");
+
+    app.add_option_group("group-a", "");
+
+    app.add_option_group("group-b", "");
+
+    std::string help = app.help();
+
+    auto footer_loc = help.find("[email protected]");
+    auto footer_loc2 = help.find("[email protected]", footer_loc + 10);
+    CHECK(footer_loc != std::string::npos);
+    // should only see the footer once
+    CHECK(footer_loc2 == std::string::npos);
+}
+
 TEST_CASE("THelp: OptionalPositional", "[help]") {
     CLI::App app{"My prog", "program"};