optimize function location in workspace symbols

Author: lukaszsamson

apps/language_server/lib/language_server.ex

@@ -134,6 +134,8 @@ defmodule ElixirLS.LanguageServer do
         true
       end
 
+    :persistent_term.put(:language_server_eep48, supported)
+
     JsonRpc.telemetry("eep48", %{"elixir_ls.eep48" => to_string(supported)}, %{})
   end
 

apps/language_server/lib/language_server/dialyzer/success_typings.ex

@@ -1,21 +1,27 @@
 defmodule ElixirLS.LanguageServer.Dialyzer.SuccessTypings do
   alias ElixirLS.LanguageServer.SourceFile
+  require Logger
 
   def suggest_contracts(plt, files) do
-    modules =
-      plt
-      |> :dialyzer_plt.all_modules()
-      |> :sets.to_list()
+    {us, results} = :timer.tc(fn ->
+      modules =
+        plt
+        |> :dialyzer_plt.all_modules()
+        |> :sets.to_list()
 
-    for mod <- modules,
-        file = source(mod),
-        file in files,
-        {{^mod, fun, arity} = mfa, success_typing} <- success_typings(plt, mod),
-        :dialyzer_plt.lookup_contract(plt, mfa) == :none,
-        {stripped_fun, stripped_arity} = SourceFile.strip_macro_prefix({fun, arity}),
-        line = SourceFile.function_line(mod, stripped_fun, stripped_arity),
-        is_integer(line) and line > 0,
-        do: {file, line, {mod, stripped_fun, stripped_arity}, success_typing, stripped_fun != fun}
+      for mod <- modules,
+          file = source(mod),
+          file in files,
+          docs = ElixirSense.Core.Normalized.Code.get_docs(mod, :docs),
+          {{^mod, fun, arity} = mfa, success_typing} <- success_typings(plt, mod),
+          :dialyzer_plt.lookup_contract(plt, mfa) == :none,
+          {stripped_fun, stripped_arity} = SourceFile.strip_macro_prefix({fun, arity}),
+          line = SourceFile.function_line(mod, stripped_fun, stripped_arity, docs),
+          is_integer(line) and line > 0,
+          do: {file, line, {mod, stripped_fun, stripped_arity}, success_typing, stripped_fun != fun}
+    end)
+    Logger.info("Success typings computed in #{div(us, 1000)}ms")
+    results
   end
 
   defp source(module) do

apps/language_server/lib/language_server/providers/workspace_symbols.ex

@@ -275,16 +275,16 @@ defmodule ElixirLS.LanguageServer.Providers.WorkspaceSymbols do
     end
   end
 
-  defp find_function_location(module, function, arity, path) do
+  defp find_function_location(module, function, arity, path, docs) do
     line =
       if String.ends_with?(path, ".erl") do
         ErlangSourceFile.function_line(path, function)
       else
-        SourceFile.function_line(module, function, arity)
+        SourceFile.function_line(module, function, arity, docs)
       end
 
     # both functions can return nil
-    max(line || 1, 1)
+    line || 1
   end
 
   defp find_module_path(module, beam_file) do
@@ -420,9 +420,10 @@ defmodule ElixirLS.LanguageServer.Providers.WorkspaceSymbols do
       |> do_process_chunked(fn chunk ->
         for {module, path} <- chunk,
             Code.ensure_loaded?(module),
+            docs = if(not String.ends_with?(path, ".erl"), do: ElixirSense.Core.Normalized.Code.get_docs(module, :docs)),
             {function, arity} <- module.module_info(:exports) do
           {function, arity} = SourceFile.strip_macro_prefix({function, arity})
-          location = find_function_location(module, function, arity, path)
+          location = find_function_location(module, function, arity, path, docs)
 
           build_result(:functions, {module, function, arity}, path, location, project_dir)
         end
@@ -467,11 +468,11 @@ defmodule ElixirLS.LanguageServer.Providers.WorkspaceSymbols do
 
     {:ok, _pid} =
       Task.start_link(fn ->
-        results = fun.()
+        {us, results} = :timer.tc(fun)
 
         send(self, {:indexing_complete, key, results})
 
-        Logger.info("[ElixirLS WorkspaceSymbols] #{length(results)} #{key} added to index")
+        Logger.info("[ElixirLS WorkspaceSymbols] #{length(results)} #{key} added to index in #{div(us, 1000)}ms")
       end)
 
     :ok

apps/language_server/lib/language_server/source_file.ex

@@ -158,8 +158,8 @@ defmodule ElixirLS.LanguageServer.SourceFile do
     end
   end
 
-  def function_line(mod, fun, arity) do
-    case ElixirSense.Core.Normalized.Code.get_docs(mod, :docs) do
+  def function_line(mod, fun, arity, docs \\ nil) do
+    case docs || ElixirSense.Core.Normalized.Code.get_docs(mod, :docs) do
       nil ->
         nil