Skip to content

Commit 7704a35

Browse files
committed
if not x, do: y => unless x, do: y
1 parent b01d328 commit 7704a35

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
### Improvements
66

77
* deprecations: `~R` -> `~r`, `Date.range/2` -> `Date.range/3` with decreasing dates (h/t @milmazz)
8+
* if: rewrite `if not x, do: y` => `unless x, do: y`
89
* pipes: `|> Enum.map(foo) |> Map.new()` => `|> Map.new(foo)`
10+
* pipes: remove unnecessary `then/2` on named function captures: `|> then(&foo/1)` => `|> foo()`, `|> then(&foo(&1, ...))` => `|> foo(...)` (thanks to @tfiedlerdejanze for the idea + impl!)
911

1012
## v0.11.6
1113

lib/style/blocks.ex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ defmodule Styler.Style.Blocks do
177177
[{negator, _, [expr]}, [{do_, do_body}, {else_, else_body}]] when is_negator(negator) ->
178178
zipper |> Zipper.replace({:if, m, [expr, [{do_, else_body}, {else_, do_body}]]}) |> run(ctx)
179179

180+
# if not x, do: y => unless x, do: y
181+
[{negator, _, [expr]}, [do_block]] when is_negator(negator) ->
182+
zipper |> Zipper.replace({:unless, m, [expr, [do_block]]}) |> run(ctx)
183+
180184
# drop `else: nil`
181185
[head, [do_block, {_, {:__block__, _, [nil]}}]] ->
182186
{:cont, Zipper.replace(zipper, {:if, m, [head, [do_block]]}), ctx}

test/style/blocks_test.exs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,12 @@ defmodule Styler.Style.BlocksTest do
767767
""")
768768
end
769769

770+
test "if not => unless" do
771+
assert_style("if not x, do: y", "unless x, do: y")
772+
assert_style("if !x, do: y", "unless x, do: y")
773+
assert_style("if !!x, do: y", "if x, do: y")
774+
end
775+
770776
test "Credo.Check.Refactor.UnlessWithElse" do
771777
for negator <- ["!", "not "] do
772778
assert_style(
@@ -826,15 +832,8 @@ defmodule Styler.Style.BlocksTest do
826832

827833
test "Credo.Check.Refactor.NegatedConditionsWithElse" do
828834
for negator <- ["!", "not "] do
829-
assert_style("if #{negator}foo, do: :bar")
830835
assert_style("if #{negator}foo, do: :bar, else: :baz", "if foo, do: :baz, else: :bar")
831836

832-
assert_style("""
833-
if #{negator}foo do
834-
bar
835-
end
836-
""")
837-
838837
assert_style(
839838
"""
840839
if #{negator}foo do

0 commit comments

Comments
 (0)