Fix for spaces in names issue

Henry Fredrick Schreiner · Henry Schreiner
1 parent 93311928
Showing 4 changed files with 27 additions and 2 deletions
include/CLI/Split.hpp
tests/AppTest.cpp
tests/CreationTest.cpp
tests/HelpersTest.cpp
@@ -44,10 +44,10 @@ inline std::vector&lt;std::string&gt; split_names(std::string current) {
     std::vector<std::string> output;
     size_t val;
     while((val = current.find(",")) != std::string::npos) {
-        output.push_back(current.substr(0, val));
+        output.push_back(trim_copy(current.substr(0, val)));
         current = current.substr(val + 1);
     }
-    output.push_back(current);
+    output.push_back(trim_copy(current));
     return output;
 }
  
@@ -260,6 +260,7 @@ TEST_F(TApp, Positionals) {
     EXPECT_EQ("thing2", posit2);
 }
  
+
 TEST_F(TApp, ForcedPositional) {
     std::vector<std::string> posit;
     auto one = app.add_flag("--one");
@@ -230,3 +230,24 @@ TEST_F(TApp, CheckNameNoCase) {
     EXPECT_TRUE(pos2->check_name("pOs2"));
     EXPECT_TRUE(pos2->check_name("pos2"));
 }
+
+
+TEST_F(TApp, PreSpaces) {
+    int x;
+    auto myapp = app.add_option(" -a, --long, other", x);
+    
+    EXPECT_TRUE(myapp->check_lname("long"));
+    EXPECT_TRUE(myapp->check_sname("a"));
+    EXPECT_TRUE(myapp->check_name("other"));
+    
+}
+
+TEST_F(TApp, AllSpaces) {
+    int x;
+    auto myapp = app.add_option(" -a , --long , other ", x);
+    
+    EXPECT_TRUE(myapp->check_lname("long"));
+    EXPECT_TRUE(myapp->check_sname("a"));
+    EXPECT_TRUE(myapp->check_name("other"));
+    
+}
@@ -179,6 +179,9 @@ TEST(Split, StringList) {
  
     std::vector<std::string> results{"a", "long", "--lone", "-q"};
     EXPECT_EQ(results, CLI::detail::split_names("a,long,--lone,-q"));
+    EXPECT_EQ(results, CLI::detail::split_names(" a, long, --lone, -q"));
+    EXPECT_EQ(results, CLI::detail::split_names(" a , long , --lone , -q "));
+    EXPECT_EQ(results, CLI::detail::split_names("   a  ,  long  ,  --lone  ,    -q  "));
  
     EXPECT_EQ(std::vector<std::string>({"one"}), CLI::detail::split_names("one"));
 }