Use the new API for go-to-definition

Author: JakeBecker

apps/language_server/lib/language_server/providers/definition.ex

@@ -4,22 +4,28 @@ defmodule ElixirLS.LanguageServer.Providers.Definition do
   """
 
   alias ElixirLS.LanguageServer.SourceFile
+  alias ElixirSense.Providers.Definition.Location
 
-  def definition(text, line, character) do
+  def definition(uri, text, line, character) do
     case ElixirSense.definition(text, line + 1, character + 1) do
-      {"non_existing", nil} ->
+      %Location{found: false} ->
         {:ok, []}
 
-      {file, line} ->
+      %Location{file: file, line: line, column: column} ->
         line = line || 0
-        uri = SourceFile.path_to_uri(file)
+        column = column || 0
+        uri =
+          case file do
+            nil -> uri
+            _ -> SourceFile.path_to_uri(file)
+          end
 
         {:ok,
          %{
            "uri" => uri,
            "range" => %{
-             "start" => %{"line" => line - 1, "character" => 0},
-             "end" => %{"line" => line - 1, "character" => 0}
+             "start" => %{"line" => line - 1, "character" => column - 1},
+             "end" => %{"line" => line - 1, "character" => column - 1}
            }
          }}
     end

apps/language_server/lib/language_server/server.ex

@@ -333,7 +333,7 @@ defmodule ElixirLS.LanguageServer.Server do
 
   defp handle_request(definition_req(_id, uri, line, character), state) do
     fun = fn ->
-      Definition.definition(state.source_files[uri].text, line, character)
+      Definition.definition(uri, state.source_files[uri].text, line, character)
     end
 
     {:async, fun, state}

apps/language_server/test/server_test.exs

@@ -88,11 +88,13 @@ defmodule ElixirLS.LanguageServer.ServerTest do
 
     assert_receive response(1, %{
                      "range" => %{
-                       "end" => %{"character" => 0, "line" => 0},
-                       "start" => %{"character" => 0, "line" => 0}
+                       "end" => %{"character" => column, "line" => 0},
+                       "start" => %{"character" => column, "line" => 0}
                      },
                      "uri" => ^uri
                    })
+
+    assert column > 0
   end
 
   test "requests cancellation", %{server: server} do