Change OptionParser to remove the end of command options (--)

Author: lexmag

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), Enum.reverse(args, value), Enum.reverse(invalid)}
+  defp parse(["--"|t], _aliases, _switches, dict, args, invalid, _all) do
+    {Enum.reverse(dict), Enum.reverse(args, t), Enum.reverse(invalid)}
   end
 
   defp parse(["-" <> option|t], aliases, switches, dict, args, invalid, all) do

lib/elixir/test/elixir/option_parser_test.exs

@@ -154,12 +154,15 @@ defmodule OptionParserTest do
 
   test "stops on --" do
     options = OptionParser.parse(["--source", "from_docs/", "--", "1", "2", "3"])
-    assert options == {[source: "from_docs/"], ["--", "1", "2", "3"], []}
+    assert options == {[source: "from_docs/"], ["1", "2", "3"], []}
 
     options = OptionParser.parse_head(["--source", "from_docs/", "--", "1", "2", "3"])
-    assert options == {[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"], []}
+
+    options = OptionParser.parse_head(["--no-dash", "foo", "bar", "--", "-x"])
     assert options == {[no_dash: true], ["foo", "bar", "--", "-x"], []}
   end