make sure dialyzer uses project dir instead of cwd

Author: lukaszsamson

apps/language_server/lib/language_server/dialyzer.ex

@@ -6,6 +6,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
   require Logger
 
   defstruct [
+    :project_dir,
     :parent,
     :timestamp,
     :plt,
@@ -51,10 +52,10 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
     GenServer.start_link(__MODULE__, {parent, root_path}, name: {:global, {parent, __MODULE__}})
   end
 
-  def analyze(parent \\ self(), build_ref, warn_opts, warning_format) do
+  def analyze(parent \\ self(), build_ref, warn_opts, warning_format, project_dir) do
     GenServer.cast(
       {:global, {parent, __MODULE__}},
-      {:analyze, build_ref, warn_opts, warning_format}
+      {:analyze, build_ref, warn_opts, warning_format, project_dir}
     )
   end
 
@@ -111,7 +112,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
         _from,
         state
       ) do
-    diagnostics = to_diagnostics(warnings, state.warn_opts, state.warning_format)
+    diagnostics = to_diagnostics(warnings, state.warn_opts, state.warning_format, state.project_dir)
 
     Server.dialyzer_finished(state.parent, diagnostics, build_ref)
 
@@ -146,15 +147,15 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
   end
 
   @impl GenServer
-  def handle_cast({:analyze, build_ref, warn_opts, warning_format}, state) do
+  def handle_cast({:analyze, build_ref, warn_opts, warning_format, project_dir}, state) do
     state =
       ElixirLS.LanguageServer.Build.with_build_lock(fn ->
         if Mix.Project.get() do
           Logger.info("[ElixirLS Dialyzer] Checking for stale beam files")
           new_timestamp = adjusted_timestamp()
 
           {removed_files, file_changes} =
-            update_stale(state.md5, state.removed_files, state.file_changes, state.timestamp)
+            update_stale(state.md5, state.removed_files, state.file_changes, state.timestamp, project_dir)
 
           state = %{
             state
@@ -163,7 +164,8 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
               removed_files: removed_files,
               file_changes: file_changes,
               build_ref: build_ref,
-              warning_format: warning_format
+              warning_format: warning_format,
+              project_dir: project_dir
           }
 
           trigger_analyze(state)
@@ -213,14 +215,14 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
   defp trigger_analyze(%{analysis_pid: nil} = state), do: do_analyze(state)
   defp trigger_analyze(state), do: state
 
-  defp update_stale(md5, removed_files, file_changes, timestamp) do
+  defp update_stale(md5, removed_files, file_changes, timestamp, project_dir) do
     prev_paths = Map.keys(md5) |> MapSet.new()
 
     # FIXME: Private API
     all_paths =
       for path <- Mix.Utils.extract_files([Mix.Project.build_path()], [:beam]),
           into: MapSet.new(),
-          do: Path.relative_to_cwd(path)
+          do: Path.relative_to(path, project_dir)
 
     removed =
       prev_paths
@@ -338,7 +340,8 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
       timestamp: timestamp,
       removed_files: removed_files,
       file_changes: file_changes,
-      build_ref: build_ref
+      build_ref: build_ref,
+      project_dir: project_dir
     } = state
 
     {us, {active_plt, mod_deps, md5, warnings}} =
@@ -408,7 +411,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
         {active_plt, new_mod_deps, raw_warnings} = Analyzer.analyze(active_plt, files_to_analyze)
 
         mod_deps = update_mod_deps(mod_deps, new_mod_deps, removed_modules)
-        warnings = add_warnings(warnings, raw_warnings)
+        warnings = add_warnings(warnings, raw_warnings, project_dir)
 
         md5 = Map.drop(md5, removed_files)
 
@@ -435,15 +438,15 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
     end
   end
 
-  defp add_warnings(warnings, raw_warnings) do
+  defp add_warnings(warnings, raw_warnings, project_dir) do
     new_warnings =
       for {_, {file, line, m_or_mfa}, _} = warning <- raw_warnings,
           module = resolve_module(m_or_mfa),
           # Dialyzer warnings have the file path at the start of the app it's
           # in, which breaks umbrella apps. We have to manually resolve the file
           # from the module instead.
-          file = resolve_module_file(module, file),
-          in_project?(file) do
+          file = resolve_module_file(module, file, project_dir),
+          in_project?(file, project_dir) do
         {module, {file, line, warning}}
       end
 
@@ -455,18 +458,18 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
   defp resolve_module(module) when is_atom(module), do: module
   defp resolve_module({module, _, _}) when is_atom(module), do: module
 
-  defp resolve_module_file(module, fallback) do
+  defp resolve_module_file(module, fallback, project_dir) do
     # We try to resolve the module to its source file. The only time the source
     # info may not be available is when it has been stripped by the beam_lib
     # module, but that shouldn't be the case. More info:
     # http://erlang.org/doc/reference_manual/modules.html#module_info-0-and-module_info-1-functions
     if Code.ensure_loaded?(module) do
       module.module_info(:compile)
       |> Keyword.get(:source, fallback)
-      |> Path.relative_to_cwd()
+      |> Path.relative_to(project_dir)
     else
       # In case the file fails to load return fallback
-      Path.relative_to_cwd(fallback)
+      Path.relative_to(fallback, project_dir)
     end
   end
 
@@ -486,8 +489,8 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
     end
   end
 
-  defp in_project?(path) do
-    File.exists?(path) and String.starts_with?(Path.absname(path), File.cwd!())
+  defp in_project?(path, project_dir) do
+    File.exists?(path) and String.starts_with?(Path.absname(path), project_dir)
   end
 
   defp module_md5(file) do
@@ -505,7 +508,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
     end
   end
 
-  defp to_diagnostics(warnings_map, warn_opts, warning_format) do
+  defp to_diagnostics(warnings_map, warn_opts, warning_format, project_dir) do
     tags_enabled = Analyzer.matching_tags(warn_opts)
     deps_path = Mix.Project.deps_path()
 
@@ -514,7 +517,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
         {tag, _, _} = data,
         tag in tags_enabled,
         source_file = Path.absname(to_string(source_file)),
-        in_project?(source_file),
+        in_project?(source_file, project_dir),
         not String.starts_with?(source_file, deps_path) do
       %Mix.Task.Compiler.Diagnostic{
         compiler_name: "ElixirLS Dialyzer",

apps/language_server/lib/language_server/server.ex

@@ -1278,7 +1278,7 @@ defmodule ElixirLS.LanguageServer.Server do
       (state.settings["dialyzerWarnOpts"] || [])
       |> Enum.map(&String.to_atom/1)
 
-    Dialyzer.analyze(state.build_ref, warn_opts, dialyzer_default_format(state))
+    Dialyzer.analyze(state.build_ref, warn_opts, dialyzer_default_format(state), state.project_dir)
 
     state
   end