Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions lib/elixir/lib/kernel.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 17 additions & 0 deletions lib/elixir/test/elixir/kernel/alias_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading