From fc35014dad86a528f25a2105476938a220a3fd40 Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Thu, 16 Nov 2017 10:57:35 -0500
Subject: [PATCH] Adding remaining, only works on master app for now

---
 include/CLI/App.hpp      |  9 +++++++++
 tests/SubcommandTest.cpp | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
index ecb0b48a..9b0c340f 100644
--- a/include/CLI/App.hpp
+++ b/include/CLI/App.hpp
@@ -863,6 +863,15 @@ class App {
     /// This gets a vector of pointers with the original parse order
     const std::vector<Option *> &parse_order() const { return parse_order_; }
 
+    /// This retuns the missing options from the current subcommand
+    std::vector<std::string> remaining() const {
+        std::vector<std::string> miss_list;
+        for(const std::pair<detail::Classifer, std::string>& miss : missing_) {
+            miss_list.push_back(std::get<1>(miss));
+        }
+        return miss_list;
+    }
+    
     ///@}
 
   protected:
diff --git a/tests/SubcommandTest.cpp b/tests/SubcommandTest.cpp
index 6e2e7e05..83591e7b 100644
--- a/tests/SubcommandTest.cpp
+++ b/tests/SubcommandTest.cpp
@@ -281,6 +281,32 @@ TEST_F(TApp, RequiredSubCom) {
     run();
 }
 
+TEST_F(TApp, SubComExtras) {
+    app.allow_extras();
+    auto sub = app.add_subcommand("sub");
+
+    args = {"extra", "sub"};
+    run();
+    EXPECT_EQ(app.remaining(), std::vector<std::string>({"extra"}));
+    EXPECT_EQ(sub->remaining(), std::vector<std::string>());
+
+    app.reset();
+    
+    args = {"extra1", "extra2", "sub"};
+    run();
+    EXPECT_EQ(app.remaining(), std::vector<std::string>({"extra1", "extra2"}));
+    EXPECT_EQ(sub->remaining(), std::vector<std::string>());
+    
+    app.reset();
+
+    //args = {"sub", "extra"};
+    //run();
+    //EXPECT_EQ(app.remaining(), std::vector<std::string>());
+    //EXPECT_EQ(sub->remaining(), std::vector<std::string>({"extra"}));
+
+
+}
+
 TEST_F(TApp, Required1SubCom) {
     app.require_subcommand(1);
     app.add_subcommand("sub1");