refactor: using the new dataflow analysis to extract function

Author: gp-pereira

lib/refactorex/refactor/function/extract_function.ex

@@ -5,6 +5,7 @@ defmodule Refactorex.Refactor.Function.ExtractFunction do
     works_on: :selection
 
   alias Refactorex.Refactor.{
+    Dataflow,
     Function,
     Module,
     Pipeline,
@@ -38,7 +39,7 @@ defmodule Refactorex.Refactor.Function.ExtractFunction do
 
   def refactor(%{node: node} = zipper, selection) do
     name = Function.next_available_function_name(zipper, @function_name)
-    args = find_function_args(zipper, selection)
+    args = Dataflow.outer_variables(selection)
     new_arg = {:arg1, [], nil}
 
     cond do
@@ -69,12 +70,4 @@ defmodule Refactorex.Refactor.Function.ExtractFunction do
         |> Function.new_private_function(name, args, selection)
     end
   end
-
-  defp find_function_args(zipper, selection) do
-    available_variables = Variable.find_available_variables(zipper)
-
-    selection
-    |> Variable.list_unique_variables()
-    |> Enum.reject(&(not Variable.member?(available_variables, &1)))
-  end
 end

lib/refactorex/refactor/variable.ex

@@ -48,25 +48,10 @@ defmodule Refactorex.Refactor.Variable do
     |> Z.node()
   end
 
-  # remove later ?
-  def find_available_variables(%{node: node} = zipper) do
-    line = AST.get_start_line(node)
-
-    zipper
-    # go to outer scope
-    |> Z.find(:prev, fn
-      {id, _, _} when id in ~w(defmodule def defp)a -> true
-      _ -> false
-    end)
-    |> Z.node()
-    |> list_unique_variables()
-    |> Enum.reject(&(AST.get_start_line(&1) >= line))
-  end
-
   def list_unique_variables(node, filter_fn \\ fn _zipper -> true end) do
     node
     |> list_variables(filter_fn)
-    |> remove_duplicates()
+    |> Enum.uniq_by(fn {name, _, _} -> name end)
   end
 
   def list_unpinned_variables(node),
@@ -91,9 +76,6 @@ defmodule Refactorex.Refactor.Variable do
     |> elem(1)
   end
 
-  def remove_duplicates(variables),
-    do: Enum.uniq_by(variables, fn {name, _, _} -> name end)
-
   def member?(variables, {name, _, _} = _variable),
     do: Enum.any?(variables, &match?({^name, _, _}, &1))