Merge pull request #2265 from lexmag/master

Fix handling of end of command options (`--`) in `OptionParser`

Author: José Valim

lib/elixir/lib/option_parser.ex

@@ -120,8 +120,8 @@ defmodule OptionParser do
     parse(argv, aliases, switches, [], [], [], all)
   end
 
-  defp parse(["--"|_] = value, _aliases, _switches, dict, _args, invalid, _all) do
-    {Enum.reverse(dict), value, Enum.reverse(invalid)}
+  defp parse(["--"|_] = value, _aliases, _switches, dict, args, invalid, _all) do
+    {Enum.reverse(dict), Enum.reverse(args, value), Enum.reverse(invalid)}
   end
 
   defp parse(["-" <> option|t], aliases, switches, dict, args, invalid, all) do

lib/elixir/test/elixir/option_parser_test.exs

@@ -125,6 +125,9 @@ defmodule OptionParserTest do
 
     options = OptionParser.parse_head(["--source", "from_docs/", "--", "1", "2", "3"])
     assert options == {[source: "from_docs/"], ["--", "1", "2", "3"], []}
+
+    options = OptionParser.parse(["--no-dash", "foo", "bar", "--", "-x"])
+    assert options == {[no_dash: true], ["foo", "bar", "--", "-x"], []}
   end
 
   test "goes beyond the first non option arguments" do