Fix bug in delete => drop logic. Closes #177

adobe · Jun 13, 2024 · d95ad27 · d95ad27
1 parent b156a2a
commit d95ad27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/style/single_node.ex b/lib/style/single_node.ex
@@ -138,13 +138,15 @@ defmodule Styler.Style.SingleNode do
     defp style({{:., dm, [{_, _, [unquote(m)]} = module, :merge]}, m, [lhs, [{key, value}]]}),
       do: {{:., dm, [module, :put]}, m, [lhs, key, value]}
 
-    # lhs |> Map.drop([key]) => lhs |> Map.delete(key)
-    defp style({:|>, pm, [lhs, {{:., dm, [{_, _, [unquote(m)]} = module, :drop]}, m, [{:__block__, _, [[key]]}]}]}),
-      do: {:|>, pm, [lhs, {{:., dm, [module, :delete]}, m, [key]}]}
+    # (lhs |>) Map.drop([key]) => Map.delete(key)
+    defp style({{:., dm, [{_, _, [unquote(m)]} = module, :drop]}, m, [{:__block__, _, [[{op, _, _} = key]]}]})
+         when op != :|,
+         do: {{:., dm, [module, :delete]}, m, [key]}
 
     # Map.drop(foo, [one_key]) => Map.delete(foo, one_key)
-    defp style({{:., dm, [{_, _, [unquote(m)]} = module, :drop]}, m, [lhs, {:__block__, _, [[key]]}]}),
-      do: {{:., dm, [module, :delete]}, m, [lhs, key]}
+    defp style({{:., dm, [{_, _, [unquote(m)]} = module, :drop]}, m, [lhs, {:__block__, _, [[{op, _, _} = key]]}]})
+         when op != :|,
+         do: {{:., dm, [module, :delete]}, m, [lhs, key]}
   end
 
   # Timex.now() => DateTime.utc_now()

diff --git a/test/style/single_node_test.exs b/test/style/single_node_test.exs
@@ -54,6 +54,7 @@ defmodule Styler.Style.SingleNodeTest do
         assert_style("foo |> #{module}.drop([]) |> bar()")
         assert_style("foo |> #{module}.drop([a, b]) |> bar()")
         assert_style("foo |> #{module}.drop(keys) |> bar()")
+        assert_style("foo |> #{module}.drop([:key | others]) |> bar()")
       end
     end
 
@@ -64,6 +65,7 @@ defmodule Styler.Style.SingleNodeTest do
         assert_style("#{module}.drop(foo, [])")
         assert_style("#{module}.drop(foo, [a, b])")
         assert_style("#{module}.drop(foo, keys)")
+        assert_style("#{module}.drop([:key | others])")
       end
     end
   end