Fix command-line arguments handling in Kernel.CLI

Author: lexmag

lib/elixir/lib/kernel/cli.ex

@@ -178,7 +178,11 @@ defmodule Kernel.CLI do
       "-" <> _ ->
         shared_option? list, config, &process_argv(&1, &2)
       _ ->
-        {%{config | commands: [{:file, h} | config.commands]}, t}
+        if Keyword.has_key?(config.commands, :eval) do
+          {config, list}
+        else
+          {%{config | commands: [{:file, h} | config.commands]}, t}
+        end
     end
   end
 

lib/elixir/test/elixir/kernel/cli_test.exs

@@ -7,9 +7,17 @@ defmodule Kernel.CLI.InitTest do
 
   test "handles code on initialization" do
     assert elixir('-e "IO.puts [?3]"') == '3\n'
+    assert elixir('#{fixture_path("init_sample.exs")}') == '3\n'
+  end
+
+  test "argv handling" do
+    expected = '#{inspect ["sample.exs", "-o", "1", "2"]}\n'
+    assert elixir('-e "IO.puts inspect(System.argv)" sample.exs -o 1 2') == expected
+    assert elixir('-e "IO.puts inspect(System.argv)" -- sample.exs -o 1 2') == expected
+    assert elixir('-e "IO.puts inspect(System.argv)" --hidden sample.exs -o 1 2') == expected
 
-    result = elixir('-e "IO.puts inspect(System.argv)" #{fixture_path("init_sample.exs")} -o 1 2 3')
-    assert result == '#{inspect ["-o", "1", "2", "3"]}\n3\n'
+    result = elixir('-e "IO.puts inspect(System.argv)" -- --hidden sample.exs -o 1 2')
+    assert result == '#{inspect ["--hidden", "sample.exs", "-o", "1", "2"]}\n'
   end
 end