Apply the remaining suggestions

Author: scottming

apps/language_server/lib/language_server/experimental/code_mod/location.ex

@@ -1,8 +1,8 @@
 defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.GotoDefinition do
   alias ElixirLS.LanguageServer.Experimental.Protocol.Requests.GotoDefinition
   alias ElixirLS.LanguageServer.Experimental.Protocol.Responses
-  alias ElixirLS.LanguageServer.Experimental.CodeMod.Location, as: CodeModLocation
   alias ElixirLS.LanguageServer.Experimental.SourceFile
+  alias ElixirLS.LanguageServer.Experimental.SourceFile.Conversions
   require Logger
 
   def handle(%GotoDefinition{} = request, _) do
@@ -13,15 +13,15 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.GotoDefinition
 
     with %ElixirSense.Location{} = location <-
            ElixirSense.definition(source_file_string, pos.line, pos.character + 1),
-         {:ok, lsp_location} <- CodeModLocation.to_lsp(location, source_file) do
+         {:ok, lsp_location} <- Conversions.to_lsp(location, source_file) do
       {:reply, Responses.GotoDefinition.new(request.id, lsp_location)}
     else
       nil ->
         {:reply, Responses.GotoDefinition.new(request.id, nil)}
 
       {:error, reason} ->
         Logger.error("GotoDefinition failed: #{inspect(reason)}")
-        {:error, Responses.GotoDefinition.error(request.id, :request_failed, reason)}
+        {:error, Responses.GotoDefinition.error(request.id, :request_failed, inspect(reason))}
     end
   end
 end

apps/language_server/lib/language_server/experimental/provider/handlers/goto_definition.ex

@@ -15,6 +15,7 @@ defmodule ElixirLS.LanguageServer.Experimental.SourceFile.Conversions do
   alias ElixirLS.LanguageServer.Experimental.SourceFile.Position, as: ElixirPosition
   alias ElixirLS.LanguageServer.Experimental.Protocol.Types.Position, as: LSPosition
   alias ElixirLS.LanguageServer.Experimental.Protocol.Types.Range, as: LSRange
+  alias ElixirLS.LanguageServer.Experimental.Protocol.Types.Location, as: LSLocation
   alias ElixirLS.LanguageServer.Protocol
 
   import Line
@@ -102,6 +103,19 @@ defmodule ElixirLS.LanguageServer.Experimental.SourceFile.Conversions do
     {:ok, range}
   end
 
+  def to_lsp(
+        %ElixirSense.Location{line: line, column: column} = elixir_sense_location,
+        %SourceFile{} = source_file
+      ) do
+    position = SourceFile.Position.new(line, column - 1)
+
+    with {:ok, source_file} <- fetch_source_file(elixir_sense_location, source_file),
+         {:ok, ls_position} <- to_lsp(position, source_file) do
+      ls_range = %LSRange{start: ls_position, end: ls_position}
+      {:ok, LSLocation.new(uri: source_file.uri, range: ls_range)}
+    end
+  end
+
   def to_lsp(%ElixirRange{} = ex_range, %SourceFile{} = source) do
     with {:ok, start_pos} <- to_lsp(ex_range.start, source.document),
          {:ok, end_pos} <- to_lsp(ex_range.end, source.document) do
@@ -128,6 +142,13 @@ defmodule ElixirLS.LanguageServer.Experimental.SourceFile.Conversions do
   end
 
   # Private
+  defp fetch_source_file(%{file: nil}, source_file) do
+    {:ok, source_file}
+  end
+
+  defp fetch_source_file(%{file: path}, _) do
+    SourceFile.Store.open_temporary(path)
+  end
 
   defp extract_lsp_character(%ElixirPosition{} = position, line(ascii?: true, text: text)) do
     character = min(position.character, byte_size(text))

apps/language_server/lib/language_server/experimental/source_file/conversions.ex

@@ -29,7 +29,6 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     with {:ok, contents} <- File.read(file_path),
          :ok <- SourceFile.Store.open(uri, contents, 1),
-         {:ok, _source_file} <- SourceFile.Store.fetch(uri),
          {:ok, req} <- build(GotoDefinition, params) do
       GotoDefinition.to_elixir(req)
     end
@@ -40,13 +39,13 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
   end
 
   defp arrange_referenced_file do
-    file_path = FixtureHelpers.get_path("references_referenced.ex")
-    uri = Conversions.ensure_uri(file_path)
-    %{uri: uri}
+    "references_referenced.ex"
+    |> FixtureHelpers.get_path()
+    |> Conversions.ensure_uri()
   end
 
   test "find definition remote function call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_remote.ex")
     {line, char} = {4, 28}
 
@@ -59,15 +58,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 1
     assert definition.range.start.character == 6
     assert definition.range.end.line == 1
     assert definition.range.end.character == 6
   end
 
   test "find definition remote macro call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_remote.ex")
     {line, char} = {8, 28}
 
@@ -80,15 +79,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 8
     assert definition.range.start.character == 11
     assert definition.range.end.line == 8
     assert definition.range.end.character == 11
   end
 
   test "find definition imported function call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_imported.ex")
     {line, char} = {4, 5}
 
@@ -101,15 +100,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 1
     assert definition.range.start.character == 6
     assert definition.range.end.line == 1
     assert definition.range.end.character == 6
   end
 
   test "find definition imported macro call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_imported.ex")
     {line, char} = {8, 5}
 
@@ -122,15 +121,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 8
     assert definition.range.start.character == 11
     assert definition.range.end.line == 8
     assert definition.range.end.character == 11
   end
 
   test "find definition local function call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_referenced.ex")
     {line, char} = {15, 5}
 
@@ -143,15 +142,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 1
     assert definition.range.start.character == 6
     assert definition.range.end.line == 1
     assert definition.range.end.character == 6
   end
 
   test "find definition local macro call" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_referenced.ex")
     {line, char} = {19, 5}
 
@@ -164,15 +163,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 8
     assert definition.range.start.character == 11
     assert definition.range.end.line == 8
     assert definition.range.end.character == 11
   end
 
   test "find definition variable" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_referenced.ex")
     {line, char} = {4, 13}
 
@@ -185,15 +184,15 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 2
     assert definition.range.start.character == 4
     assert definition.range.end.line == 2
     assert definition.range.end.character == 4
   end
 
   test "find definition attribute" do
-    b_file = arrange_referenced_file()
+    referenced_uri = arrange_referenced_file()
     file_path = FixtureHelpers.get_path("references_referenced.ex")
     {line, char} = {27, 5}
 
@@ -206,7 +205,7 @@ defmodule ElixirLS.Experimental.Provider.Handlers.GotoDefinitionTest do
 
     {:reply, %Responses.GotoDefinition{result: definition}} = handle(request)
 
-    assert definition.uri == b_file.uri
+    assert definition.uri == referenced_uri
     assert definition.range.start.line == 24
     assert definition.range.start.character == 2
     assert definition.range.end.line == 24