refactor: renamed to Dataflow.group_variables_semantically

Author: gp-pereira

lib/refactorex/refactor/dataflow.ex

@@ -5,7 +5,7 @@ defmodule Refactorex.Refactor.Dataflow do
   defstruct commands: [],
             variables: []
 
-  def analyze(node) do
+  def group_variables_semantically(node) do
     %__MODULE__{}
     |> recursive_analyze(node)
     |> Map.get(:variables)

lib/refactorex/refactor/function/collapse_anonymous_function.ex

@@ -23,7 +23,7 @@ defmodule Refactorex.Refactor.Function.CollapseAnonymousFunction do
       not Variable.plain_variables?(args) ->
         false
 
-      some_arg_not_used?(args, Dataflow.analyze(node)) ->
+      some_arg_not_used?(args, Dataflow.group_variables_semantically(node)) ->
         false
 
       true ->
@@ -42,6 +42,6 @@ defmodule Refactorex.Refactor.Function.CollapseAnonymousFunction do
     )
   end
 
-  defp some_arg_not_used?(args, dataflow),
-    do: not Enum.all?(args, &match?([_ | _], dataflow[&1]))
+  defp some_arg_not_used?(args, variable_groups),
+    do: not Enum.all?(args, &(variable_groups[&1] != []))
 end

lib/refactorex/refactor/variable.ex

@@ -49,7 +49,7 @@ defmodule Refactorex.Refactor.Variable do
   def find_all_references(zipper, {name, _, _} = variable) do
     zipper
     |> Z.topmost_root()
-    |> Dataflow.analyze()
+    |> Dataflow.group_variables_semantically()
     |> Stream.map(fn {d, u} -> [d | u] end)
     |> Enum.find([], fn
       [{^name, _, _} | _] = references ->
@@ -61,10 +61,10 @@ defmodule Refactorex.Refactor.Variable do
   end
 
   def replace_variables_by_values(selection, variables, values, scope) do
-    dataflow = Dataflow.analyze(scope)
+    variable_groups = Dataflow.group_variables_semantically(scope)
 
     variables
-    |> Stream.map(&dataflow[&1])
+    |> Stream.map(&variable_groups[&1])
     |> Stream.zip(values)
     |> Enum.reduce(
       Z.zip(selection),

lib/refactorex/refactor/variable/underscore_not_used.ex

@@ -8,7 +8,7 @@ defmodule Refactorex.Refactor.Variable.UnderscoreNotUsed do
 
   def can_refactor?(%{node: node}, line) do
     node
-    |> Dataflow.analyze()
+    |> Dataflow.group_variables_semantically()
     |> Enum.any?(fn
       {{name, _, _} = declaration, []} ->
         AST.starts_at?(declaration, line) and
@@ -22,7 +22,7 @@ defmodule Refactorex.Refactor.Variable.UnderscoreNotUsed do
 
   def refactor(%{node: node} = zipper, line) do
     node
-    |> Dataflow.analyze()
+    |> Dataflow.group_variables_semantically()
     |> Stream.filter(&same_line_and_no_usages?(&1, line))
     |> Enum.reduce(zipper, fn
       {declaration, []}, zipper ->

test/refactor/dataflow_test.exs

@@ -474,7 +474,7 @@ defmodule Refactorex.Refactor.DataflowTest do
     found_variables =
       original
       |> Sourceror.parse_string!()
-      |> Dataflow.analyze()
+      |> Dataflow.group_variables_semantically()
       |> Enum.map(&AST.simpler_meta/1)
       |> Enum.into(%{})