Fix rename file version & file paths

Author: timgent

apps/language_server/lib/language_server/providers/rename.ex

@@ -49,7 +49,7 @@ defmodule ElixirLS.LanguageServer.Providers.Rename do
         %{
           "textDocument" => %{
             "uri" => uri,
-            "version" => source_file.version + 1
+            "version" => nil
           },
           "edits" =>
             Enum.map(edits, fn edit ->
@@ -83,8 +83,10 @@ defmodule ElixirLS.LanguageServer.Providers.Rename do
     {:ok, result}
   end
 
-  defp repack_references(references, uri) do
+  defp repack_references(references, start_uri) do
     for reference <- references do
+      uri = if reference.uri, do: SourceFile.path_to_uri(reference.uri), else: start_uri
+
       %{
         uri: uri,
         range: %{
@@ -99,11 +101,11 @@ defmodule ElixirLS.LanguageServer.Providers.Rename do
   end
 
   defp parse_definition_source_code(%{file: file}) do
-    ElixirSense.Core.Parser.parse_file(file, true, true, 0)
+    ElixirSense.Core.Parser.parse_file(file, true, true, nil)
   end
 
   defp parse_definition_source_code(source_text) when is_binary(source_text) do
-    ElixirSense.Core.Parser.parse_string(source_text, true, true, 0)
+    ElixirSense.Core.Parser.parse_string(source_text, true, true, nil)
   end
 
   defp get_all_fn_header_positions(parsed_source, char_ident) do

apps/language_server/test/providers/rename_test.exs

@@ -38,7 +38,7 @@ defmodule ElixirLS.LanguageServer.Providers.RenameTest do
 
       edits =
         Rename.rename(%SourceFile{text: text, version: 0}, @fake_uri, line, char, "test")
-        |> assert_return_structure_and_get_edits(@fake_uri, 1)
+        |> assert_return_structure_and_get_edits(@fake_uri, nil)
 
       expected_edits =
         [
@@ -70,7 +70,7 @@ defmodule ElixirLS.LanguageServer.Providers.RenameTest do
           char,
           "name"
         )
-        |> assert_return_structure_and_get_edits(@fake_uri, 1)
+        |> assert_return_structure_and_get_edits(@fake_uri, nil)
 
       expected_edits =
         [
@@ -100,7 +100,7 @@ defmodule ElixirLS.LanguageServer.Providers.RenameTest do
           char,
           "new_subtract"
         )
-        |> assert_return_structure_and_get_edits(uri, 1)
+        |> assert_return_structure_and_get_edits(uri, nil)
 
       expected_edits =
         [
@@ -128,7 +128,7 @@ defmodule ElixirLS.LanguageServer.Providers.RenameTest do
           char,
           "new_add"
         )
-        |> assert_return_structure_and_get_edits(uri, 1)
+        |> assert_return_structure_and_get_edits(uri, nil)
 
       expected_edits =
         [
@@ -160,14 +160,14 @@ defmodule ElixirLS.LanguageServer.Providers.RenameTest do
                   %{
                     "textDocument" => %{
                       "uri" => ^uri,
-                      "version" => 1
+                      "version" => nil
                     },
                     "edits" => file_edits
                   },
                   %{
                     "textDocument" => %{
                       "uri" => ^fn_definition_file_uri,
-                      "version" => 1
+                      "version" => nil
                     },
                     "edits" => fn_definition_file_edits
                   }