Skip to content

Commit 54e26ba

Browse files
committed
refactor: inlined update all references
1 parent 57f71fb commit 54e26ba

File tree

2 files changed

+13
-21
lines changed

2 files changed

+13
-21
lines changed

lib/refactorex/refactor/variable.ex

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@ defmodule Refactorex.Refactor.Variable do
2121
def was_declared?(zipper, variable),
2222
do: not Enum.empty?(find_all_references(zipper, variable))
2323

24-
def update_all_references(zipper, variable, updater_fn) do
25-
references = find_all_references(zipper, variable)
26-
27-
zipper
28-
|> Z.top()
29-
|> Z.traverse(fn
30-
%{node: {_, _, nil} = node} = zipper ->
31-
if Enum.member?(references, node),
32-
do: Z.replace(zipper, updater_fn.(node)),
33-
else: zipper
34-
35-
zipper ->
36-
zipper
37-
end)
38-
end
39-
4024
def find_all_references(zipper, {name, _, _} = variable) do
4125
zipper
4226
|> Z.topmost_root()

lib/refactorex/refactor/variable/rename_variable.ex

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,18 @@ defmodule Refactorex.Refactor.Variable.RenameVariable do
2323
end
2424

2525
def refactor(%{node: variable} = zipper, _) do
26-
Variable.update_all_references(
27-
zipper,
28-
variable,
29-
fn {_, meta, nil} -> {placeholder(), meta, nil} end
30-
)
26+
all_references = Variable.find_all_references(zipper, variable)
27+
28+
zipper
29+
|> Z.top()
30+
|> Z.traverse(fn %{node: node} = zipper ->
31+
if Enum.member?(all_references, node) do
32+
Z.update(zipper, fn {_, meta, nil} ->
33+
{placeholder(), meta, nil}
34+
end)
35+
else
36+
zipper
37+
end
38+
end)
3139
end
3240
end

0 commit comments

Comments
 (0)