Rebase main and rename modify the %Env{} refs to %Configuratoin{}

lexical-lsp · Jul 12, 2024 · dfd7767 · dfd7767
1 parent 4400057
commit dfd7767
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 41 deletions.
diff --git a/apps/server/lib/lexical/server/provider/env.ex b/apps/server/lib/lexical/server/provider/env.ex
diff --git a/apps/server/lib/lexical/server/provider/handlers/prepare_rename.ex b/apps/server/lib/lexical/server/provider/handlers/prepare_rename.ex
@@ -5,12 +5,12 @@ defmodule Lexical.Server.Provider.Handlers.PrepareRename do
   alias Lexical.Protocol.Responses
   alias Lexical.Protocol.Types.PrepareRenameResult.PrepareRenameResult
   alias Lexical.RemoteControl.Api
-  alias Lexical.Server.Provider.Env
+  alias Lexical.Server.Configuration
 
-  def handle(%PrepareRename{} = request, %Env{} = env) do
+  def handle(%PrepareRename{} = request, %Configuration{} = config) do
     case Document.Store.fetch(request.document.uri, :analysis) do
       {:ok, _document, %Ast.Analysis{valid?: true} = analysis} ->
-        prepare_rename(env.project, analysis, request.position, request.id)
+        prepare_rename(config.project, analysis, request.position, request.id)
 
       _ ->
         {:reply,

diff --git a/apps/server/lib/lexical/server/provider/handlers/rename.ex b/apps/server/lib/lexical/server/provider/handlers/rename.ex
@@ -8,23 +8,23 @@ defmodule Lexical.Server.Provider.Handlers.Rename do
   alias Lexical.Protocol.Types.TextDocument
   alias Lexical.Protocol.Types.Workspace
   alias Lexical.RemoteControl.Api
-  alias Lexical.Server.Provider.Env
+  alias Lexical.Server.Configuration
   require Logger
 
-  def handle(%Rename{} = request, %Env{} = env) do
+  def handle(%Rename{} = request, %Configuration{} = config) do
     case Document.Store.fetch(request.document.uri, :analysis) do
       {:ok, _document, %Ast.Analysis{valid?: true} = analysis} ->
-        rename(request, env, analysis)
+        rename(request, config, analysis)
 
       _ ->
         {:reply,
          Responses.Rename.error(request.id, :request_failed, "document can not be analyzed")}
     end
   end
 
-  defp rename(%Rename{} = request, %Env{} = env, analysis) do
+  defp rename(%Rename{} = request, %Configuration{} = config, analysis) do
     %Rename{id: id, position: position, new_name: new_name} = request
-    %Env{project: project, client_name: client_name} = env
+    %Configuration{project: project, client_name: client_name} = config
 
     case Api.rename(project, analysis, position, new_name, client_name) do
       {:ok, []} ->

diff --git a/apps/server/test/lexical/server/provider/handlers/prepare_rename_test.exs b/apps/server/test/lexical/server/provider/handlers/prepare_rename_test.exs
@@ -6,7 +6,7 @@ defmodule Lexical.Server.Provider.Handlers.PrepareRenameTest do
   alias Lexical.RemoteControl
 
   alias Lexical.Server
-  alias Lexical.Server.Provider.Env
+  alias Lexical.Server.Configuration
   alias Lexical.Server.Provider.Handlers
 
   import Lexical.Test.Protocol.Fixtures.LspProtocol
@@ -42,7 +42,7 @@ defmodule Lexical.Server.Provider.Handlers.PrepareRenameTest do
   end
 
   def handle(request, project) do
-    Handlers.PrepareRename.handle(request, %Env{project: project})
+    Handlers.PrepareRename.handle(request, %Configuration{project: project})
   end
 
   describe "prepare_rename" do

diff --git a/apps/server/test/lexical/server/provider/handlers/rename_test.exs b/apps/server/test/lexical/server/provider/handlers/rename_test.exs
@@ -6,7 +6,7 @@ defmodule Lexical.Server.Provider.Handlers.RenameTest do
   alias Lexical.RemoteControl
 
   alias Lexical.Server
-  alias Lexical.Server.Provider.Env
+  alias Lexical.Server.Configuration
   alias Lexical.Server.Provider.Handlers
 
   import Lexical.Test.Protocol.Fixtures.LspProtocol
@@ -42,7 +42,7 @@ defmodule Lexical.Server.Provider.Handlers.RenameTest do
   end
 
   def handle(request, project) do
-    Handlers.Rename.handle(request, %Env{project: project})
+    Handlers.Rename.handle(request, %Configuration{project: project})
   end
 
   describe "rename" do