TCLI-107 handle edge case with subcommands

Signed-off-by: Sean Corfield <sean@corfield.org>

Author: seancorfield

src/main/clojure/clojure/tools/cli.cljc

@@ -637,7 +637,7 @@
                              :strict      strict
                              :subcommand  subcommand)]
     {:options opts
-     :arguments (into rest-args implicit-args)
+     :arguments (into implicit-args rest-args)
      :summary ((or summary-fn summarize) specs)
      :errors (when (seq errors) errors)}))
 

src/test/clojure/clojure/tools/cli_test.cljc

@@ -470,6 +470,22 @@
     (is (= (:errors (parse-opts ["-a" "-b"]
                                 [["-b" "--beta"]]
                                 :subcommand :implicit))
+           nil))
+    (is (= (:arguments (parse-opts ["-a" "foo" "-b"]
+                                   [["-b" "--beta"]]
+                                   :subcommand :explicit))
+           ["foo" "-b"]))
+    (is (= (:errors (parse-opts ["-a" "foo" "-b"]
+                                [["-b" "--beta"]]
+                                :subcommand :explicit))
+           ["Unknown option: \"-a\""]))
+    (is (= (:arguments (parse-opts ["-a" "foo" "-b"]
+                                   [["-b" "--beta"]]
+                                   :subcommand :implicit))
+           ["-a" "foo" "-b"]))
+    (is (= (:errors (parse-opts ["-a" "foo" "-b"]
+                                [["-b" "--beta"]]
+                                :subcommand :implicit))
            nil)))
   (testing "does not merge over default values when :no-defaults is true"
     (let [option-specs [["-p" "--port PORT" :default 80]