--elixirc-paths should be a subset of project paths

Since the manifest is shared, --elixirc-paths must
be a subset as we need to know what to change and what
to not change in the manifest file.

Signed-off-by: José Valim <[email protected]>

Author: José Valim

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

@@ -13,9 +13,9 @@ defmodule Mix.Compilers.Elixir do
   in between modules, which helps it recompile only the modules that
   have changed at runtime.
   """
-  def compile(manifest, srcs, exts, dest, force, on_start) do
-    all = Mix.Utils.extract_files(srcs, exts)
-    all_entries = read_manifest(manifest)
+  def compile(manifest, srcs, skip, exts, dest, force, on_start) do
+    all = Mix.Utils.extract_files(srcs -- skip, exts)
+    {all_entries, skip_entries} = read_manifest(manifest, skip)
 
     removed =
       for {_b, _m, source, _d, _f, _bin} <- all_entries, not(source in all), do: source
@@ -41,15 +41,15 @@ defmodule Mix.Compilers.Elixir do
             do: source)
       end
 
-    {entries, changed} = remove_stale_entries(all_entries, removed ++ changed, [], [])
+    {entries, changed} = remove_stale_entries(all_entries, removed ++ changed)
     stale = changed -- removed
 
     cond do
       stale != [] ->
-        compile_manifest(manifest, entries, stale, dest, on_start)
+        compile_manifest(manifest, entries ++ skip_entries, stale, dest, on_start)
         :ok
       removed != [] ->
-        write_manifest(manifest, entries)
+        write_manifest(manifest, entries ++ skip_entries)
         :ok
       true ->
         :noop
@@ -102,7 +102,7 @@ defmodule Mix.Compilers.Elixir do
         entries
       end
     after
-      Agent.stop pid
+      Agent.stop(pid, :infinity)
     end
 
     :ok
@@ -144,7 +144,7 @@ defmodule Mix.Compilers.Elixir do
 
   # This function receives the manifest entries and some source
   # files that have changed. It then, recursively, figures out
-  # all the files that changed (thanks to the dependencies) and
+  # all the files that changed (via the module dependencies) and
   # return their sources as the remaining entries.
   defp remove_stale_entries(all, []) do
     {all, []}
@@ -181,27 +181,40 @@ defmodule Mix.Compilers.Elixir do
 
   # Reads the manifest returning the results as tuples.
   # The beam files are read, removed and stored in memory.
-  defp read_manifest(manifest) do
+  defp read_manifest(manifest, skip_paths) do
+    initial = {[], []}
+
     case File.read(manifest) do
       {:ok, contents} ->
-        Enum.reduce String.split(contents, "\n"), [], fn x, acc ->
-          case String.split(x, "\t") do
-            [beam, module, source|deps] ->
-              {deps, files} =
-                case Enum.split_while(deps, &(&1 != "Elixir")) do
-                  {deps, ["Elixir"|files]} -> {deps, files}
-                  {deps, _} -> {deps, []}
-                end
-              [{beam, module, source, deps, files, nil}|acc]
-            _ ->
-              acc
-          end
+        skip_paths = Enum.map(skip_paths, &(&1 <> "/"))
+        Enum.reduce String.split(contents, "\n"), initial, fn x, acc ->
+          read_manifest_entry(String.split(x, "\t"), acc, skip_paths)
         end
       {:error, _} ->
-        []
+        initial
     end
   end
 
+  defp read_manifest_entry([beam, module, source|deps], {keep, skip}, skip_paths) do
+    {deps, files} =
+      case Enum.split_while(deps, &(&1 != "Elixir")) do
+        {deps, ["Elixir"|files]} -> {deps, files}
+        {deps, _} -> {deps, []}
+      end
+
+    entry = {beam, module, source, deps, files, nil}
+
+    if String.starts_with?(source, skip_paths) do
+      {keep, [entry|skip]}
+    else
+      {[entry|keep], skip}
+    end
+  end
+
+  defp read_manifest_entry(_, acc, _skip_paths) do
+    acc
+  end
+
   # Writes the manifest separating entries by tabs.
   defp write_manifest(_manifest, []) do
     :ok

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -22,8 +22,8 @@ defmodule Mix.Tasks.Compile.Elixir do
     * `--debug-info` (`--no-debug-info`) - attach (or not) debug info to compiled modules
     * `--ignore-module-conflict` - do not emit warnings if a module was previously defined
     * `--warnings-as-errors` - treat warnings as errors and return a non-zero exit code
-    * `--elixirc-paths` - paths to lookup for Elixir source.
-      Can be given multiple times and, once given, overrides the project elixirc_paths config.
+    * `--elixirc-paths` - restrict the original elixirc paths to
+      a subset of the ones specified. Can be given multiple times.
 
   ## Configuration
 
@@ -51,18 +51,20 @@ defmodule Mix.Tasks.Compile.Elixir do
 
     project = Mix.Project.config
     dest = Mix.Project.compile_path(project)
-    srcs = case Keyword.get_values(opts, :elixirc_paths) do
-      [] -> project[:elixirc_paths]
-      ep -> ep
-    end
+    srcs = project[:elixirc_paths]
+    skip =
+      case Keyword.get_values(opts, :elixirc_paths) do
+        [] -> []
+        ep -> srcs -- ep
+      end
 
     manifest = manifest()
     configs  = Mix.Project.config_files ++ Mix.Tasks.Compile.Erlang.manifests
 
     force = opts[:force] || local_deps_changed?(manifest)
               || Mix.Utils.stale?(configs, [manifest])
 
-    Mix.Compilers.Elixir.compile(manifest, srcs, [:ex], dest, force, fn ->
+    Mix.Compilers.Elixir.compile(manifest, srcs, skip, [:ex], dest, force, fn ->
       true = Code.prepend_path(dest)
       set_compiler_opts(project, opts, [])
     end)

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

@@ -173,7 +173,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
 
   defmodule SourcePathsProject do
     def project do
-      [app: :source_paths, elixirc_paths: ["unknown"]]
+      [app: :source_paths, elixirc_paths: ["web", "lib"]]
     end
   end
 
@@ -182,11 +182,18 @@ defmodule Mix.Tasks.Compile.ElixirTest do
 
     in_fixture "no_mixfile", fn ->
       # Nothing to compile with the custom source paths
-      assert Mix.Tasks.Compile.Elixir.run([])
+      assert Mix.Tasks.Compile.Elixir.run(["--elixirc-paths", "web"])
       refute_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
 
       assert Mix.Tasks.Compile.Elixir.run(["--elixirc-paths", "lib"])
       assert_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
+
+      # Compiling just web does not remove lib artifacts
+      assert Mix.Tasks.Compile.Elixir.run(["--elixirc-paths", "web"])
+      refute_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
+
+      assert Mix.Tasks.Compile.Elixir.run(["--elixirc-paths", "lib"])
+      refute_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
     end
   end
 end