Use :dot_iex as the option name consistently

Author: josevalim

lib/elixir/src/iex.erl

@@ -72,7 +72,7 @@ sync_remote(Parent, Ref) ->
   receive {done, Ref} -> ok end.
 
 start_mfa(Args, MFA) ->
-  Opts = [{dot_iex_path, get_dot_iex(Args)}, {on_eof, halt}],
+  Opts = [{dot_iex, get_dot_iex(Args)}, {on_eof, halt}],
   {?MODULE, start, [Opts, MFA]}.
 
 get_dot_iex(["--dot-iex", H | _]) -> elixir_utils:characters_to_binary(H);

lib/iex/lib/iex/cli.ex

@@ -105,7 +105,7 @@ defmodule IEx.CLI do
   end
 
   defp options do
-    [dot_iex_path: find_dot_iex(:init.get_plain_arguments()), on_eof: :halt]
+    [dot_iex: find_dot_iex(:init.get_plain_arguments()), on_eof: :halt]
   end
 
   defp abort(msg) do

lib/iex/lib/iex/evaluator.ex

@@ -244,9 +244,9 @@ defmodule IEx.Evaluator do
       ref: ref
     }
 
-    dot_iex_path = opts[:dot_iex_path] || Config.dot_iex()
+    dot_iex = opts[:dot_iex] || Config.dot_iex()
 
-    case dot_iex_path do
+    case dot_iex do
       "" -> state
       path -> load_dot_iex(state, path)
     end

lib/iex/lib/iex/pry.ex

@@ -35,7 +35,7 @@ defmodule IEx.Pry do
 
     opts = [
       binding: binding,
-      dot_iex_path: "",
+      dot_iex: "",
       # Remove all tracers because the tracer code is most
       # likely stale by the time we are prying the code.
       env: %{env | tracers: [], lexical_tracker: nil},

lib/iex/lib/iex/server.ex

@@ -338,13 +338,13 @@ defmodule IEx.Server do
       prefix: prefix,
       on_eof: on_eof,
       expand_fun: expand_fun,
-      evaluator_options: Keyword.take(opts, [:dot_iex_path])
+      evaluator_options: Keyword.take(opts, [:dot_iex])
     }
   end
 
   # For the state, reset only reset the parser state.
   # The counter will continue going up as the input process is shared.
-  # The opts can also set "dot_iex_path" and the "evaluator" itself,
+  # The opts can also set "dot_iex" and the "evaluator" itself,
   # but those are not stored: they are temporary to whatever is rerunning.
   # Once the rerunning session restarts, we keep the same evaluator_options
   # and rollback to a new evaluator.

lib/iex/test/iex/helpers_test.exs

@@ -1247,7 +1247,7 @@ defmodule IEx.HelpersTest do
 
       with_file(["dot-iex-1", "dot-iex-2"], [dot_1, dot_2], fn ->
         assert capture_io(:stderr, fn ->
-                 assert capture_iex(":ok", [], dot_iex_path: "dot-iex-1") == ":ok"
+                 assert capture_iex(":ok", [], dot_iex: "dot-iex-1") == ":ok"
                end) =~ "dot-iex-2 was already imported, skipping circular file imports"
       end)
     end

lib/iex/test/iex/interaction_test.exs

@@ -5,7 +5,7 @@ defmodule IEx.InteractionTest do
 
   test "whole output" do
     assert capture_io("IO.puts \"Hello world\"", fn ->
-             IEx.Server.run(dot_iex_path: "")
+             IEx.Server.run(dot_iex: "")
            end) =~
              "Interactive Elixir (#{System.version()}) - press Ctrl+C to exit (type h() ENTER for help)" <>
                "\niex(1)> Hello world\n:ok\niex(2)>"
@@ -257,7 +257,7 @@ defmodule IEx.InteractionTest do
         my_variable = 42
         """)
 
-      assert capture_iex("{my_fun_single(), my_variable}", [], dot_iex_path: path) ==
+      assert capture_iex("{my_fun_single(), my_variable}", [], dot_iex: path) ==
                "{:single, 42}"
     end
 
@@ -275,7 +275,7 @@ defmodule IEx.InteractionTest do
         write_dot_iex!(tmp_dir, "dot-iex", "import_file \"#{tmp_dir}/dot-iex-1\"\nmy_variable=13")
 
       input = "nested_var\nmy_variable\nmy_fun_nested()"
-      assert capture_iex(input, [], dot_iex_path: path) == "42\n13\n:nested"
+      assert capture_iex(input, [], dot_iex: path) == "42\n13\n:nested"
     end
 
     @tag :tmp_dir
@@ -289,7 +289,7 @@ defmodule IEx.InteractionTest do
         my_variable = 42
         """)
 
-      assert capture_iex("{my_fun_single(), my_variable}", [dot_iex: path], dot_iex_path: nil) ==
+      assert capture_iex("{my_fun_single(), my_variable}", [dot_iex: path], dot_iex: nil) ==
                "{:single, 42}"
     end
   end

lib/iex/test/iex/server_test.exs

@@ -8,7 +8,7 @@ defmodule IEx.ServerTest do
   describe "options" do
     test "prefix" do
       assert capture_io(fn ->
-               IEx.Server.run(prefix: "custom", dot_iex_path: "")
+               IEx.Server.run(prefix: "custom", dot_iex: "")
              end) =~ "custom(1)> "
     end
 
@@ -141,7 +141,7 @@ defmodule IEx.ServerTest do
 
       assert capture_io(:stderr, fn ->
                {server, evaluator} =
-                 pry_session(config.test, "Y\nmy_variable", dot_iex_path: path)
+                 pry_session(config.test, "Y\nmy_variable", dot_iex: path)
 
                client = pry_request([server])
                send(evaluator, :run)
@@ -159,15 +159,15 @@ defmodule IEx.ServerTest do
       File.write!(path, "my_variable = 144")
 
       {server, evaluator} =
-        pry_session(config.test, "Y\ncontinue\nmy_variable", dot_iex_path: path)
+        pry_session(config.test, "Y\ncontinue\nmy_variable", dot_iex: path)
 
       client = pry_request([server])
       send(evaluator, :run)
 
       assert Task.await(server) =~ "144"
       assert Task.await(client) == {:ok, false}
 
-      {server, evaluator} = pry_session(config.test, "Y\nnext\nmy_variable", dot_iex_path: path)
+      {server, evaluator} = pry_session(config.test, "Y\nnext\nmy_variable", dot_iex: path)
 
       client = pry_request([server])
       send(evaluator, :run)

lib/iex/test/test_helper.exs

@@ -79,7 +79,7 @@ defmodule IEx.Case do
     IEx.configure(options)
 
     ExUnit.CaptureIO.capture_io([input: input, capture_prompt: capture_prompt], fn ->
-      server_options = Keyword.put_new(server_options, :dot_iex_path, "")
+      server_options = Keyword.put_new(server_options, :dot_iex, "")
       IEx.Server.run(server_options)
     end)
     |> strip_iex()