From 851f8dc83d5e2a6c52e97bafaeee58fe1da361c3 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Wed, 22 Nov 2017 14:33:55 -0500
Subject: [PATCH] Adding and fixing a test for single name

---
 include/CLI/Option.hpp |  4 ++--
 tests/HelpTest.cpp     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 344f511c..414bcf92 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -362,9 +362,9 @@ class Option : public OptionBase<Option> {
     /// The most discriptive name available
     std::string single_name() const {
         if(!lnames_.empty())
-            return lnames_[0];
+            return std::string("--") + lnames_[0];
         else if(!snames_.empty())
-            return snames_[0];
+            return std::string("-") + snames_[0];
         else
             return pname_;
     }
diff --git a/tests/HelpTest.cpp b/tests/HelpTest.cpp
index 06e83169..b7f5cecb 100644
--- a/tests/HelpTest.cpp
+++ b/tests/HelpTest.cpp
@@ -354,6 +354,20 @@ TEST(THelp, CustomHelp) {
     }
 }
 
+TEST(THelp, NiceName) {
+    CLI::App app;
+    
+    int x;
+    auto long_name = app.add_option("-s,--long,-q,--other,that", x);
+    auto short_name = app.add_option("more,-x,-y", x);
+    auto positional = app.add_option("posit", x);
+    
+    EXPECT_EQ(long_name->single_name(), "--long");
+    EXPECT_EQ(short_name->single_name(), "-x");
+    EXPECT_EQ(positional->single_name(), "posit");
+    
+}
+
 TEST(Exit, ErrorWithHelp) {
     CLI::App app{"My prog"};