diff --git a/lib/elixir/lib/kernel.ex b/lib/elixir/lib/kernel.ex index 44bad71893..1386b3e5ae 100644 --- a/lib/elixir/lib/kernel.ex +++ b/lib/elixir/lib/kernel.ex @@ -5255,14 +5255,20 @@ defmodule Kernel do defp alias_defmodule({:__aliases__, _, _}, module, %{module: nil}), do: {module, module, []} # defmodule Alias nested - defp alias_defmodule({:__aliases__, _, [h | t]}, _module, env) when is_atom(h) do - module = :elixir_aliases.concat([env.module, h]) - alias = String.to_unsafe_atom("Elixir." <> Atom.to_string(h)) - opts = [as: alias, warn: false] - - case t do - [] -> {module, module, opts} - _ -> {String.to_unsafe_atom(Enum.join([module | t], ".")), module, opts} + defp alias_defmodule({:__aliases__, _, [h | t]}, module, env) when is_atom(h) do + case Atom.to_string(h) do + "Elixir." <> _ -> + {module, module, []} + + head -> + module = :elixir_aliases.concat([env.module, h]) + alias = String.to_unsafe_atom("Elixir." <> head) + opts = [as: alias, warn: false] + + case t do + [] -> {module, module, opts} + _ -> {String.to_unsafe_atom(Enum.join([module | t], ".")), module, opts} + end end end diff --git a/lib/elixir/test/elixir/kernel/alias_test.exs b/lib/elixir/test/elixir/kernel/alias_test.exs index 6c29fc2c09..99a1d7716c 100644 --- a/lib/elixir/test/elixir/kernel/alias_test.exs +++ b/lib/elixir/test/elixir/kernel/alias_test.exs @@ -79,6 +79,14 @@ defmodule Kernel.AliasTest do end defmodule Kernel.AliasNestingGenerator do + defmacro create_absolute do + quote do + defmodule unquote(__MODULE__).Child do + def value, do: :child + end + end + end + defmacro create do quote do defmodule Parent do @@ -136,6 +144,15 @@ defmodule Kernel.AliasNestingTest do {Elixir.AliasEnv, Another.AliasEnv} ] end + + require Kernel.AliasNestingGenerator + Kernel.AliasNestingGenerator.create_absolute() + def aliases_after_absolute, do: __ENV__.aliases + + test "does not create aliases for a fully qualified atom alias head" do + assert Kernel.AliasNestingGenerator.Child.value() == :child + assert aliases_after_absolute() == aliases_after() + end end # Test case extracted from using records with aliases