Skip to content

Commit 405f299

Browse files
committed
unify some code stylings, remove <- operator
1 parent 9b6c8d3 commit 405f299

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/style/pipes.ex

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ defmodule Styler.Style.Pipes do
3636
@literal ~w(__block__ __aliases__ unquote)a
3737
@value_constructors ~w(% %{} .. ..// <<>> @ {} ^ & fn from)a
3838
@kernel_ops ~w(++ -- && || in - * + / > < <= >= == and or != !== === <>)a
39-
@special_ops ~w(<- ||| &&& <<< >>> <<~ ~>> <~ ~> <~>)a
39+
@special_ops ~w(||| &&& <<< >>> <<~ ~>> <~ ~> <~>)a
4040
@special_ops @literal ++ @value_constructors ++ @kernel_ops ++ @special_ops
4141

4242
def run({{:|>, _, _}, _} = zipper, ctx) do
@@ -276,15 +276,15 @@ defmodule Styler.Style.Pipes do
276276
Style.set_line({:|>, [], [lhs, {new, nm, [mapper]}]}, nm[:line])
277277
end
278278

279-
for mod <- [:Map, :Keyword] do
280-
# lhs |> Map.merge(%{key: value}) => lhs |> Map.put(key, value)
281-
defp fix_pipe({:|>, pm, [lhs, {{:., dm, [{_, _, [unquote(mod)]} = mod, :merge]}, m, [{:%{}, _, [{key, value}]}]}]}),
282-
do: {:|>, pm, [lhs, {{:., dm, [mod, :put]}, m, [key, value]}]}
279+
# lhs |> Map.merge(%{key: value}) => lhs |> Map.put(key, value)
280+
defp fix_pipe({:|>, pm, [lhs, {{:., dm, [{_, _, [mod]} = module, :merge]}, m, [{:%{}, _, [{key, value}]}]}]})
281+
when mod in [:Map, :Keyword],
282+
do: {:|>, pm, [lhs, {{:., dm, [module, :put]}, m, [key, value]}]}
283283

284-
# lhs |> Map.merge(key: value) => lhs |> Map.put(:key, value)
285-
defp fix_pipe({:|>, pm, [lhs, {{:., dm, [{_, _, [unquote(mod)]} = module, :merge]}, m, [[{key, value}]]}]}),
286-
do: {:|>, pm, [lhs, {{:., dm, [module, :put]}, m, [key, value]}]}
287-
end
284+
# lhs |> Map.merge(key: value) => lhs |> Map.put(:key, value)
285+
defp fix_pipe({:|>, pm, [lhs, {{:., dm, [{_, _, [mod]} = module, :merge]}, m, [[{key, value}]]}]})
286+
when mod in [:Map, :Keyword],
287+
do: {:|>, pm, [lhs, {{:., dm, [module, :put]}, m, [key, value]}]}
288288

289289
defp fix_pipe(node), do: node
290290

test/style/pipes_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ defmodule Styler.Style.PipesTest do
517517
end
518518

519519
# Doesn't rewrite non-kernel operators
520-
for op <- ~w(<- ||| &&& <<< >>> <<~ ~>> <~ ~> <~>) do
520+
for op <- ~w(||| &&& <<< >>> <<~ ~>> <~ ~> <~>) do
521521
assert_style "a |> then(&(&1 #{op} x)) |> c()"
522522
end
523523
end

0 commit comments

Comments
 (0)