use parser contest in test code lens

Author: lukaszsamson

apps/language_server/lib/language_server/providers/code_lens.ex

@@ -13,7 +13,8 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens do
   def spec_code_lens(server_instance_id, uri, text),
     do: CodeLens.TypeSpec.code_lens(server_instance_id, uri, text)
 
-  def test_code_lens(uri, text, project_dir), do: CodeLens.Test.code_lens(uri, text, project_dir)
+  def test_code_lens(parser_context, project_dir),
+    do: CodeLens.Test.code_lens(parser_context, project_dir)
 
   def build_code_lens(line, title, command, argument) do
     %{

apps/language_server/lib/language_server/providers/code_lens/test.ex

@@ -12,40 +12,39 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens.Test do
   alias ElixirLS.LanguageServer.Providers.CodeLens.Test.DescribeBlock
   alias ElixirLS.LanguageServer.Providers.CodeLens.Test.TestBlock
   alias ElixirLS.LanguageServer.SourceFile
-  alias ElixirSense.Core.Parser
+  alias ElixirLS.LanguageServer.Parser
 
   @run_test_command "elixir.lens.test.run"
 
-  def code_lens(uri = "file:" <> _, text, project_dir) do
-    with {:ok, buffer_file_metadata} <- parse_source(text) do
-      source_lines = SourceFile.lines(text)
+  def code_lens(
+        %Parser.Context{source_file: source_file, metadata: metadata, path: path},
+        project_dir
+      ) do
+    source_lines = SourceFile.lines(source_file)
 
-      file_path = SourceFile.Path.from_uri(uri)
+    calls_list =
+      metadata.calls
+      |> Enum.map(fn {_k, v} -> v end)
+      |> List.flatten()
 
-      calls_list =
-        buffer_file_metadata.calls
-        |> Enum.map(fn {_k, v} -> v end)
-        |> List.flatten()
+    lines_to_env_list =
+      metadata.lines_to_env
+      |> Enum.sort_by(&elem(&1, 0))
 
-      lines_to_env_list =
-        buffer_file_metadata.lines_to_env
-        |> Enum.sort_by(&elem(&1, 0))
+    describe_blocks = find_describe_blocks(lines_to_env_list, calls_list, source_lines)
+    describe_lenses = get_describe_lenses(describe_blocks, path, project_dir)
 
-      describe_blocks = find_describe_blocks(lines_to_env_list, calls_list, source_lines)
-      describe_lenses = get_describe_lenses(describe_blocks, file_path, project_dir)
+    test_lenses =
+      lines_to_env_list
+      |> find_test_blocks(calls_list, describe_blocks, source_lines)
+      |> get_test_lenses(path, project_dir)
 
-      test_lenses =
-        lines_to_env_list
-        |> find_test_blocks(calls_list, describe_blocks, source_lines)
-        |> get_test_lenses(file_path, project_dir)
+    module_lenses =
+      lines_to_env_list
+      |> get_test_modules()
+      |> get_module_lenses(path, project_dir)
 
-      module_lenses =
-        lines_to_env_list
-        |> get_test_modules()
-        |> get_module_lenses(file_path, project_dir)
-
-      {:ok, test_lenses ++ describe_lenses ++ module_lenses}
-    end
+    {:ok, test_lenses ++ describe_lenses ++ module_lenses}
   end
 
   defp get_test_lenses(test_blocks, file_path, project_dir) do
@@ -154,16 +153,4 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens.Test do
       call_info.position
     end
   end
-
-  defp parse_source(text) do
-    buffer_file_metadata =
-      text
-      |> Parser.parse_string(true, true, {1, 1})
-
-    if buffer_file_metadata.error != nil do
-      {:error, buffer_file_metadata}
-    else
-      {:ok, buffer_file_metadata}
-    end
-  end
 end

apps/language_server/lib/language_server/server.ex

@@ -1127,17 +1127,10 @@ defmodule ElixirLS.LanguageServer.Server do
     source_file = get_source_file(state, uri)
 
     fun = fn ->
+      parser_context = Parser.parse_immediate(uri, source_file)
       {:ok, spec_code_lenses} = get_spec_code_lenses(state, uri, source_file)
 
-      test_code_lenses =
-        case get_test_code_lenses(state, uri, source_file) do
-          {:ok, test_code_lenses} ->
-            test_code_lenses
-
-          {:error, %ElixirSense.Core.Metadata{error: reason}} ->
-            Logger.info("Error while building test code lenses: #{inspect(reason)}")
-            []
-        end
+      {:ok, test_code_lenses} = get_test_code_lenses(state, uri, parser_context)
 
       {:ok, spec_code_lenses ++ test_code_lenses}
     end
@@ -1252,7 +1245,7 @@ defmodule ElixirLS.LanguageServer.Server do
   defp get_test_code_lenses(
          state = %__MODULE__{project_dir: project_dir},
          "file:" <> _ = uri,
-         source_file,
+         parser_context,
          true = _umbrella
        )
        when is_binary(project_dir) do
@@ -1266,7 +1259,7 @@ defmodule ElixirLS.LanguageServer.Server do
 
       {app, app_path} ->
         if is_test_file?(file_path, state, app, app_path) do
-          CodeLens.test_code_lens(uri, source_file.text, Path.join(project_dir, app_path))
+          CodeLens.test_code_lens(parser_context, Path.join(project_dir, app_path))
         else
           {:ok, []}
         end
@@ -1276,15 +1269,15 @@ defmodule ElixirLS.LanguageServer.Server do
   defp get_test_code_lenses(
          %__MODULE__{project_dir: project_dir},
          "file:" <> _ = uri,
-         source_file,
+         parser_context,
          false = _umbrella
        )
        when is_binary(project_dir) do
     try do
       file_path = SourceFile.Path.from_uri(uri)
 
       if is_test_file?(file_path, project_dir) do
-        CodeLens.test_code_lens(uri, source_file.text, project_dir)
+        CodeLens.test_code_lens(parser_context, project_dir)
       else
         {:ok, []}
       end
@@ -1293,7 +1286,7 @@ defmodule ElixirLS.LanguageServer.Server do
     end
   end
 
-  defp get_test_code_lenses(%__MODULE__{}, _uri, _source_file, _), do: {:ok, []}
+  defp get_test_code_lenses(%__MODULE__{}, _uri, _parser_context, _), do: {:ok, []}
 
   defp is_test_file?(file_path, state = %__MODULE__{project_dir: project_dir}, app, app_path)
        when is_binary(project_dir) do