Do not cache inputs from .formatter.exs

Author: josevalim

lib/mix/lib/mix/tasks/format.ex

@@ -176,7 +176,7 @@ defmodule Mix.Tasks.Format do
   ]
 
   @manifest "cached_dot_formatter"
-  @manifest_vsn 1
+  @manifest_vsn 2
 
   @doc """
   Returns which features this plugin should plug into.
@@ -304,10 +304,21 @@ defmodule Mix.Tasks.Format do
     else
       manifest = Path.join(Mix.Project.manifest_path(), @manifest)
 
-      maybe_cache_in_manifest(dot_formatter, manifest, fn ->
-        {subdirectories, sources} = eval_subs_opts(subs, prefix, sources)
-        {{eval_deps_opts(formatter_opts, deps), subdirectories}, sources}
-      end)
+      {{locals_without_parens, subdirectories}, sources} =
+        maybe_cache_in_manifest(dot_formatter, manifest, fn ->
+          {subdirectories, sources} = eval_subs_opts(subs, prefix, sources)
+          {{eval_deps_opts(deps), subdirectories}, sources}
+        end)
+
+      formatter_opts =
+        Keyword.update(
+          formatter_opts,
+          :locals_without_parens,
+          locals_without_parens,
+          &(locals_without_parens ++ &1)
+        )
+
+      {{formatter_opts, subdirectories}, sources}
     end
   end
 
@@ -342,29 +353,21 @@ defmodule Mix.Tasks.Format do
     {entry, sources}
   end
 
-  defp eval_deps_opts(formatter_opts, []) do
-    formatter_opts
+  defp eval_deps_opts([]) do
+    []
   end
 
-  defp eval_deps_opts(formatter_opts, deps) do
+  defp eval_deps_opts(deps) do
     deps_paths = Mix.Project.deps_paths()
 
-    parenless_calls =
-      for dep <- deps,
-          dep_path = assert_valid_dep_and_fetch_path(dep, deps_paths),
-          dep_dot_formatter = Path.join(dep_path, ".formatter.exs"),
-          File.regular?(dep_dot_formatter),
-          dep_opts = eval_file_with_keyword_list(dep_dot_formatter),
-          parenless_call <- dep_opts[:export][:locals_without_parens] || [],
-          uniq: true,
-          do: parenless_call
-
-    Keyword.update(
-      formatter_opts,
-      :locals_without_parens,
-      parenless_calls,
-      &(&1 ++ parenless_calls)
-    )
+    for dep <- deps,
+        dep_path = assert_valid_dep_and_fetch_path(dep, deps_paths),
+        dep_dot_formatter = Path.join(dep_path, ".formatter.exs"),
+        File.regular?(dep_dot_formatter),
+        dep_opts = eval_file_with_keyword_list(dep_dot_formatter),
+        parenless_call <- dep_opts[:export][:locals_without_parens] || [],
+        uniq: true,
+        do: parenless_call
   end
 
   defp eval_subs_opts(subs, prefix, sources) do

lib/mix/test/mix/tasks/format_test.exs

@@ -178,6 +178,37 @@ defmodule Mix.Tasks.FormatTest do
     end)
   end
 
+  test "does not cache inputs from .formatter.exs", context do
+    in_tmp(context.test, fn ->
+      File.write!(".formatter.exs", """
+      [
+        inputs: Path.wildcard("{a,b}.ex"),
+        locals_without_parens: [foo: 1]
+      ]
+      """)
+
+      File.write!("a.ex", """
+      foo bar baz
+      """)
+
+      Mix.Tasks.Format.run([])
+
+      assert File.read!("a.ex") == """
+             foo bar(baz)
+             """
+
+      File.write!("b.ex", """
+      bar baz bat
+      """)
+
+      Mix.Tasks.Format.run([])
+
+      assert File.read!("b.ex") == """
+             bar(baz(bat))
+             """
+    end)
+  end
+
   test "expands patterns in inputs from .formatter.exs", context do
     in_tmp(context.test, fn ->
       File.write!(".formatter.exs", """
@@ -343,7 +374,7 @@ defmodule Mix.Tasks.FormatTest do
     end)
   end
 
-  test "can read exported configuration from subdirectories", context do
+  test "reads exported configuration from subdirectories", context do
     in_tmp(context.test, fn ->
       File.write!(".formatter.exs", """
       [subdirectories: ["lib"]]
@@ -396,7 +427,7 @@ defmodule Mix.Tasks.FormatTest do
     end)
   end
 
-  test "can read exported configuration from dependencies", context do
+  test "reads exported configuration from dependencies", context do
     in_tmp(context.test, fn ->
       Mix.Project.push(__MODULE__.FormatWithDepsApp)
 
@@ -434,7 +465,7 @@ defmodule Mix.Tasks.FormatTest do
     end)
   end
 
-  test "can read exported configuration from dependencies and subdirectories", context do
+  test "reads exported configuration from dependencies and subdirectories", context do
     in_tmp(context.test, fn ->
       Mix.Project.push(__MODULE__.FormatWithDepsApp)