More fixes

Author: josevalim

lib/mix/lib/mix/compilers/elixir.ex

@@ -921,26 +921,21 @@ defmodule Mix.Compilers.Elixir do
          protocols_and_impls,
          timestamp
        ) do
-    if modules == %{} and sources == %{} do
-      File.rm(manifest)
-    else
-      File.mkdir_p!(Path.dirname(manifest))
-
-      term =
-        {@manifest_vsn, modules, sources, exports, parents, cache_key, deps_config, project_mtime,
-         config_mtime, protocols_and_impls}
+    File.mkdir_p!(Path.dirname(manifest))
 
-      manifest_data = :erlang.term_to_binary(term, [:compressed])
-      File.write!(manifest, manifest_data)
-      File.touch!(manifest, timestamp)
-      delete_checkpoint(manifest)
+    term =
+      {@manifest_vsn, modules, sources, exports, parents, cache_key, deps_config, project_mtime,
+       config_mtime, protocols_and_impls}
 
-      # Since Elixir is a dependency itself, we need to touch the lock
-      # so the current Elixir version, used to compile the files above,
-      # is properly stored.
-      Mix.Dep.ElixirSCM.update()
-    end
+    manifest_data = :erlang.term_to_binary(term, [:compressed])
+    File.write!(manifest, manifest_data)
+    File.touch!(manifest, timestamp)
+    delete_checkpoint(manifest)
 
+    # Since Elixir is a dependency itself, we need to touch the lock
+    # so the current Elixir version, used to compile the files above,
+    # is properly stored.
+    Mix.Dep.ElixirSCM.update()
     :ok
   end
 
@@ -1105,7 +1100,7 @@ defmodule Mix.Compilers.Elixir do
 
     state =
       {modules, exports, sources, changed, pending_modules, stale_exports,
-       maybe_consolidate(consolidation, modules, opts)}
+       maybe_consolidate(consolidation, modules, pending_modules, opts)}
 
     {:ok, state}
   end
@@ -1321,16 +1316,18 @@ defmodule Mix.Compilers.Elixir do
 
   defp protocols_and_impls(), do: {%{}, %{}}
 
-  defp maybe_consolidate({:off, _, _}, _, _) do
+  defp maybe_consolidate({:off, _, _}, _, _, _) do
     protocols_and_impls()
   end
 
   defp maybe_consolidate(
          {on_or_force, old_protocols_and_impls, protocols_and_impls},
          modules,
+         pending_modules,
          opts
        ) do
     protocols_and_impls = protocols_and_impls_from_modules(modules, protocols_and_impls)
+    protocols_and_impls = protocols_and_impls_from_modules(pending_modules, protocols_and_impls)
 
     Mix.Compilers.Protocol.compile(
       on_or_force == :force,

lib/mix/test/mix/tasks/compile.protocols_test.exs

@@ -19,7 +19,7 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       end
       """)
 
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam")
 
       # Implement a local protocol
@@ -29,21 +29,21 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       end
       """)
 
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
 
       assert mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam") !=
                @old
 
       # Delete a local implementation
       File.rm!("lib/impl.ex")
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
 
       assert mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam") !=
                @old
 
       # Delete a local protocol
       File.rm!("lib/protocol.ex")
-      assert compile_elixir_and_protocols() == :noop
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       refute File.regular?("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam")
     end)
   end
@@ -67,7 +67,7 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       end
       """)
 
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam")
       File.rm!("lib/protocol.ex")
 
@@ -77,11 +77,12 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       end
       """)
 
-      assert compile_elixir_and_protocols() == :noop
+      purge_protocol(Compile.Protocol)
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
 
       # Delete a local protocol
       File.rm!("lib/protocol.ex")
-      assert compile_elixir_and_protocols() == :noop
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       refute File.regular?("_build/dev/lib/sample/consolidated/Elixir.Compile.Protocol.beam")
     end)
   end
@@ -95,7 +96,7 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       purge_protocol(String.Chars)
       mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.String.Chars.beam")
 
-      assert compile_elixir_and_protocols() == :noop
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:noop, []}
       assert mtime("_build/dev/lib/sample/consolidated/Elixir.String.Chars.beam") == @old
 
       # Implement a deps protocol
@@ -108,20 +109,20 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
       end
       """)
 
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       assert mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.String.Chars.beam") != @old
 
       # Delete the local implementation
       File.rm!("lib/struct.ex")
-      assert compile_elixir_and_protocols() == :ok
+      assert Mix.Tasks.Compile.Elixir.run([]) == {:ok, []}
       assert mark_as_old!("_build/dev/lib/sample/consolidated/Elixir.String.Chars.beam") != @old
     end)
   end
 
   test "consolidated protocols keep relative path to their source" do
     in_fixture("no_mixfile", fn ->
       Mix.Project.push(MixTest.Case.Sample)
-      compile_elixir_and_protocols()
+      Mix.Task.run("compile")
 
       # Load consolidated
       :code.add_patha(~c"_build/dev/lib/sample/consolidated")
@@ -142,11 +143,6 @@ defmodule Mix.Tasks.Compile.ProtocolsTest do
     end)
   end
 
-  defp compile_elixir_and_protocols do
-    Mix.Tasks.Compile.Elixir.run([])
-    Mix.Tasks.Compile.Protocols.run([])
-  end
-
   defp mtime(path) do
     File.stat!(path).mtime
   end

lib/mix/test/mix/umbrella_test.exs

@@ -569,7 +569,7 @@ defmodule Mix.UmbrellaTest do
 
         Mix.Task.run("compile")
         assert File.regular?("_build/dev/lib/bar/consolidated/Elixir.Foo.beam")
-        assert Mix.Tasks.Compile.Protocols.run([]) == :noop
+        assert Mix.Tasks.Compile.Elixir.run([]) == {:noop, []}
 
         # Mark protocol as outdated
         File.touch!("_build/dev/lib/bar/consolidated/Elixir.Foo.beam", {{2010, 1, 1}, {0, 0, 0}})