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
2 changes: 1 addition & 1 deletion lib/recode/task/alias_order.ex
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ defmodule Recode.Task.AliasOrder do
defp lower_than?([value1 | _], [value2 | _]), do: lower_than?(value1, value2)

defp lower_than?(value1, value2) when is_atom(value1) and is_atom(value2) do
String.upcase(to_string(value1)) < String.upcase(to_string(value2))
String.downcase(to_string(value1)) < String.downcase(to_string(value2))
end

defp sort_multi({:alias, meta1, [{{:., meta2, [aliases, opts]}, meta3, multi}]}) do
Expand Down
12 changes: 8 additions & 4 deletions test/recode/task/alias_order_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,20 @@ defmodule Recode.Task.AliasOrderTest do
code = """
defmodule MyModule do
alias Beta
alias __MODULE__
alias __MODULE__.Zulu
alias Alpha
alias __MODULE__.Alpha
alias __MODULE__
end
"""

expected = """
defmodule MyModule do
alias __MODULE__
alias __MODULE__.Alpha
alias __MODULE__.Zulu
alias Alpha
alias Beta
alias __MODULE__
end
"""

Expand All @@ -96,9 +100,9 @@ defmodule Recode.Task.AliasOrderTest do

expected = """
defmodule MyModule do
alias __MODULE__, as: Charlie
alias Alpha, as: Gamma
alias Beta, as: Delta
alias __MODULE__, as: Charlie
end
"""

Expand Down Expand Up @@ -355,9 +359,9 @@ defmodule Recode.Task.AliasOrderTest do
test "reports an issue for unsorted aliases in multi with and without __MODULE__" do
"""
defmodule MyModule do
alias __MODULE__.{UserSocket, Endpoint}
alias Alpha.Bravo
alias Alpha.Bravo.{Charlie, Delta}
alias __MODULE__.{UserSocket, Endpoint}
end
"""
|> run_task(AliasOrder, autocorrect: false)
Expand Down
Loading