fix: stop sending genlsp datastructures to engine (#31)

doorgan · web-flow · commit 43d406f6d46f · 2025-07-07T17:32:11.000-03:00
* fix: convert genlsp diagnostics to lsp diagnostics

* chore: remove forge dependency on genlsp

* chore: remove debug log
diff --git a/apps/expert/lib/convertibles/forge.document.changes.ex b/apps/expert/lib/convertibles/forge.document.changes.ex
diff --git a/apps/expert/lib/convertibles/forge.document.edit.ex b/apps/expert/lib/convertibles/forge.document.edit.ex
@@ -1,5 +1,5 @@
 defimpl Forge.Protocol.Convertible, for: Forge.Document.Edit do
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias Forge.Document
   alias GenLSP.Structures.TextEdit
 
diff --git a/apps/expert/lib/convertibles/forge.document.location.ex b/apps/expert/lib/convertibles/forge.document.location.ex
@@ -1,5 +1,5 @@
 defimpl Forge.Protocol.Convertible, for: Forge.Document.Location do
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias Forge.Document
   alias GenLSP.Structures
 
diff --git a/apps/expert/lib/convertibles/forge.document.position.ex b/apps/expert/lib/convertibles/forge.document.position.ex
@@ -1,5 +1,5 @@
 defimpl Forge.Protocol.Convertible, for: Forge.Document.Position do
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias Forge.Document
 
   def to_lsp(%Document.Position{} = position) do
diff --git a/apps/expert/lib/convertibles/forge.document.range.ex b/apps/expert/lib/convertibles/forge.document.range.ex
@@ -1,5 +1,5 @@
 defimpl Forge.Protocol.Convertible, for: Forge.Document.Range do
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias Forge.Document
 
   def to_lsp(%Document.Range{} = range) do
diff --git a/apps/expert/lib/convertibles/forge.plugin.diagnostic.result.ex b/apps/expert/lib/convertibles/forge.plugin.diagnostic.result.ex
@@ -1,7 +1,7 @@
 defimpl Forge.Protocol.Convertible, for: Forge.Plugin.V1.Diagnostic.Result do
   alias GenLSP.Structures
   alias GenLSP.Enumerations.DiagnosticSeverity
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias Forge.Document
   alias Forge.Document.Position
   alias Forge.Document.Range
diff --git a/apps/expert/lib/convertibles/gen_lsp.structures.location.ex b/apps/expert/lib/convertibles/gen_lsp.structures.location.ex
@@ -1,7 +1,7 @@
 defimpl Forge.Protocol.Convertible, for: GenLSP.Structures.Location do
   alias Forge.Document
   alias Forge.Document.Container
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias GenLSP.Structures
 
   def to_lsp(%Structures.Location{} = location) do
diff --git a/apps/expert/lib/convertibles/gen_lsp.structures.position.ex b/apps/expert/lib/convertibles/gen_lsp.structures.position.ex
@@ -1,6 +1,6 @@
 defimpl Forge.Protocol.Convertible, for: GenLSP.Structures.Position do
   alias GenLSP.Structures.Position
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
 
   def to_lsp(%Position{} = position) do
     Conversions.to_lsp(position)
diff --git a/apps/expert/lib/convertibles/gen_lsp.structures.range.ex b/apps/expert/lib/convertibles/gen_lsp.structures.range.ex
@@ -1,7 +1,7 @@
 defimpl Forge.Protocol.Convertible, for: GenLSP.Structures.Range do
   alias GenLSP.Structures.Range
   alias GenLSP.Structures.Position
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
 
   def to_lsp(%Range{} = range) do
     Conversions.to_lsp(range)
diff --git a/apps/expert/lib/convertibles/gen_lsp.structures.text_edit.ex b/apps/expert/lib/convertibles/gen_lsp.structures.text_edit.ex
@@ -1,6 +1,6 @@
 defimpl Forge.Protocol.Convertible, for: GenLSP.Structures.TextEdit do
   alias Forge.Document
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias GenLSP.Structures
 
   def to_lsp(%Structures.TextEdit{} = text_edit) do
diff --git a/apps/expert/lib/expert.ex b/apps/expert/lib/expert.ex
@@ -1,8 +1,8 @@
 defmodule Expert do
   alias Expert.Provider.Handlers
   alias Expert.State
-  alias Forge.Protocol.Convert
-  alias Forge.Protocol.Id
+  alias Expert.Protocol.Convert
+  alias Expert.Protocol.Id
   alias GenLSP.Requests
   alias GenLSP.Structures
 
@@ -55,7 +55,7 @@ defmodule Expert do
         end
 
         lsp = assign(lsp, state: state)
-        {:ok, response} = Forge.Protocol.Convert.to_lsp(response)
+        {:ok, response} = Expert.Protocol.Convert.to_lsp(response)
 
         {:reply, response, lsp}
 
@@ -72,10 +72,10 @@ defmodule Expert do
   def handle_request(%mod{} = request, lsp) when mod in @server_specific_messages do
     GenLSP.error(lsp, "handling server specific request #{Macro.to_string(mod)}")
 
-    with {:ok, request} <- Forge.Protocol.Convert.to_native(request),
+    with {:ok, request} <- Expert.Protocol.Convert.to_native(request),
          {:ok, response, state} <- apply_to_state(assigns(lsp).state, request),
-         {:ok, response} <- Forge.Protocol.Convert.to_lsp(response) do
-      {:reply, Forge.Protocol.Convert.to_lsp(response), assign(lsp, state: state)}
+         {:ok, response} <- Expert.Protocol.Convert.to_lsp(response) do
+      {:reply, Expert.Protocol.Convert.to_lsp(response), assign(lsp, state: state)}
     else
       error ->
         message = "Failed to handle #{mod}, #{inspect(error)}"
@@ -95,7 +95,7 @@ defmodule Expert do
     with {:ok, handler} <- fetch_handler(request),
          {:ok, request} <- Convert.to_native(request),
          {:ok, response} <- handler.handle(request, state.configuration),
-         {:ok, response} <- Forge.Protocol.Convert.to_lsp(response) do
+         {:ok, response} <- Expert.Protocol.Convert.to_lsp(response) do
       {:reply, response, lsp}
     else
       {:error, {:unhandled, _}} ->
diff --git a/apps/expert/lib/expert/code_intelligence/completion.ex b/apps/expert/lib/expert/code_intelligence/completion.ex
@@ -238,8 +238,6 @@ defmodule Expert.CodeIntelligence.Completion do
 
     result_app = metadata[:app]
 
-    Logger.info("project_module? #{inspect(binding(), pretty: true)}")
-
     cond do
       module_app in project_apps ->
         true
diff --git a/apps/expert/lib/expert/configuration.ex b/apps/expert/lib/expert/configuration.ex
@@ -6,7 +6,7 @@ defmodule Expert.Configuration do
   alias Expert.Configuration.Support
   alias Expert.Dialyzer
   alias Forge.Project
-  alias Forge.Protocol.Id
+  alias Expert.Protocol.Id
   alias GenLSP.Notifications.WorkspaceDidChangeConfiguration
   alias GenLSP.Requests
   alias GenLSP.Structures
diff --git a/apps/expert/lib/expert/project/diagnostics.ex b/apps/expert/lib/expert/project/diagnostics.ex
@@ -95,7 +95,7 @@ defmodule Expert.Project.Diagnostics do
   defp publish_diagnostics(%State{} = state) do
     Enum.each(state.entries_by_uri, fn {uri, %State.Entry{} = entry} ->
       with {:ok, diagnostics} <-
-             entry |> State.Entry.diagnostics() |> Forge.Protocol.Convert.to_lsp() do
+             entry |> State.Entry.diagnostics() |> Expert.Protocol.Convert.to_lsp() do
         GenLSP.notify(Expert.get_lsp(), %TextDocumentPublishDiagnostics{
           params: %Structures.PublishDiagnosticsParams{uri: uri, diagnostics: diagnostics}
         })
diff --git a/apps/expert/lib/expert/project/progress/state.ex b/apps/expert/lib/expert/project/progress/state.ex
@@ -3,7 +3,7 @@ defmodule Expert.Project.Progress.State do
   alias Expert.Project.Progress.Percentage
   alias Expert.Project.Progress.Value
   alias Forge.Project
-  alias Forge.Protocol.Id
+  alias Expert.Protocol.Id
   alias GenLSP.Requests
   alias GenLSP.Structures
 
diff --git a/apps/expert/lib/expert/project/search_listener.ex b/apps/expert/lib/expert/project/search_listener.ex
@@ -2,7 +2,7 @@ defmodule Expert.Project.SearchListener do
   alias Expert.EngineApi
   alias Forge.Formats
   alias Forge.Project
-  alias Forge.Protocol.Id
+  alias Expert.Protocol.Id
   alias GenLSP.Requests
 
   import Forge.EngineApi.Messages
diff --git a/apps/expert/lib/expert/protocol/conversions.ex b/apps/expert/lib/expert/protocol/conversions.ex
@@ -1,4 +1,4 @@
-defmodule Forge.Protocol.Conversions do
+defmodule Expert.Protocol.Conversions do
   @moduledoc """
   Functions to convert between language server representations and elixir-native representations.
 
diff --git a/apps/expert/lib/expert/protocol/convert.ex b/apps/expert/lib/expert/protocol/convert.ex
@@ -1,4 +1,4 @@
-defmodule Forge.Protocol.Convert do
+defmodule Expert.Protocol.Convert do
   alias Forge.Document
   alias Forge.Protocol.Convertible
 
diff --git a/apps/expert/lib/expert/protocol/id.ex b/apps/expert/lib/expert/protocol/id.ex
@@ -1,4 +1,4 @@
-defmodule Forge.Protocol.Id do
+defmodule Expert.Protocol.Id do
   def next do
     [:monotonic, :positive]
     |> System.unique_integer()
diff --git a/apps/expert/lib/expert/provider/handlers/code_action.ex b/apps/expert/lib/expert/provider/handlers/code_action.ex
@@ -28,7 +28,7 @@ defmodule Expert.Provider.Handlers.CodeAction do
   end
 
   defp to_code_action_diagnostic(%Structures.Diagnostic{} = diagnostic) do
-    %Structures.Diagnostic{
+    %CodeAction.Diagnostic{
       range: diagnostic.range,
       message: diagnostic.message,
       source: diagnostic.source
diff --git a/apps/expert/test/conversions_test.exs b/apps/expert/test/conversions_test.exs
@@ -1,7 +1,7 @@
 defmodule Expert.Protocol.ConversionsTest do
   alias Forge.Document
   alias Forge.Document.Position, as: ExPosition
-  alias Forge.Protocol.Conversions
+  alias Expert.Protocol.Conversions
   alias GenLSP.Structures.Position, as: LSPosition
 
   use ExUnit.Case
diff --git a/apps/expert/test/convertibles/forge.document.changes_test.exs b/apps/expert/test/convertibles/forge.document.changes_test.exs
@@ -1,6 +1,6 @@
 defmodule Forge.Protocol.Convertible.Document.ChangesTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/forge.document.edit_test.exs b/apps/expert/test/convertibles/forge.document.edit_test.exs
@@ -1,6 +1,6 @@
 defmodule Forge.Protocol.Convertibles.EditTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   defmodule Inner do
     defstruct [:position]
diff --git a/apps/expert/test/convertibles/forge.document.location_test.exs b/apps/expert/test/convertibles/forge.document.location_test.exs
@@ -1,6 +1,6 @@
 defmodule Forge.Protocol.Convertibles.LocationTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/forge.document.position_test.exs b/apps/expert/test/convertibles/forge.document.position_test.exs
@@ -1,6 +1,6 @@
 defmodule Forge.Protocol.Convertibles.PositionTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   defmodule Inner do
     defstruct [:position]
diff --git a/apps/expert/test/convertibles/forge.document.range_test.exs b/apps/expert/test/convertibles/forge.document.range_test.exs
@@ -1,6 +1,6 @@
 defmodule Forge.Protocol.Convertibles.RangeTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/forge.plugin.diagnostic.result_test.exs b/apps/expert/test/convertibles/forge.plugin.diagnostic.result_test.exs
@@ -3,7 +3,7 @@ defmodule Forge.Protocol.Convertibles.Forge.Plugin.V1.Diagnostic.ResultTest do
   alias Forge.Plugin.V1.Diagnostic
   alias GenLSP.Enumerations.DiagnosticSeverity
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   import Forge.Test.CodeSigil
 
diff --git a/apps/expert/test/convertibles/gen_lsp.structures.location_test.exs b/apps/expert/test/convertibles/gen_lsp.structures.location_test.exs
@@ -1,6 +1,6 @@
 defmodule GenLsp.Structures.Convertibles.LocationTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/gen_lsp.structures.position_test.exs b/apps/expert/test/convertibles/gen_lsp.structures.position_test.exs
@@ -1,6 +1,6 @@
 defmodule GenLSP.Structures.Convertibles.PositionTest do
   alias GenLSP.Structures
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/gen_lsp.structures.range_test.exs b/apps/expert/test/convertibles/gen_lsp.structures.range_test.exs
@@ -1,5 +1,5 @@
 defmodule GenLSP.Structures.Convertibles.RangeTest do
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/convertibles/gen_lsp.structures.text_edit_test.exs b/apps/expert/test/convertibles/gen_lsp.structures.text_edit_test.exs
@@ -1,5 +1,5 @@
 defmodule GenLSP.Structures.Convertibles.TextEditTest do
-  use Forge.Test.Protocol.ConvertibleSupport
+  use Expert.Test.Protocol.ConvertibleSupport
 
   describe "to_lsp/2)" do
     setup [:with_an_open_file]
diff --git a/apps/expert/test/expert/provider/handlers/code_lens_test.exs b/apps/expert/test/expert/provider/handlers/code_lens_test.exs
@@ -3,8 +3,8 @@ defmodule Expert.Provider.Handlers.CodeLensTest do
   alias Expert.Provider.Handlers
   alias Forge.Document
   alias Forge.Project
-  alias Forge.Protocol.Convert
-  alias Forge.Protocol.Id
+  alias Expert.Protocol.Convert
+  alias Expert.Protocol.Id
   alias GenLSP.Requests.TextDocumentCodeLens
   alias GenLSP.Structures
 
diff --git a/apps/expert/test/expert/provider/handlers/find_references_test.exs b/apps/expert/test/expert/provider/handlers/find_references_test.exs
@@ -4,7 +4,7 @@ defmodule Expert.Provider.Handlers.FindReferencesTest do
   alias Forge.Ast.Analysis
   alias Forge.Document
   alias Forge.Document.Location
-  alias Forge.Protocol.Convert
+  alias Expert.Protocol.Convert
   alias GenLSP.Requests.TextDocumentReferences
   alias GenLSP.Structures
 
@@ -30,7 +30,7 @@ defmodule Expert.Provider.Handlers.FindReferencesTest do
 
     with {:ok, _} <- Document.Store.open_temporary(uri) do
       req = %TextDocumentReferences{
-        id: Forge.Protocol.Id.next(),
+        id: Expert.Protocol.Id.next(),
         params: %Structures.ReferenceParams{
           context: %Structures.ReferenceContext{
             include_declaration: true
diff --git a/apps/expert/test/expert/provider/handlers/go_to_definition_test.exs b/apps/expert/test/expert/provider/handlers/go_to_definition_test.exs
@@ -3,7 +3,7 @@ defmodule Expert.Provider.Handlers.GoToDefinitionTest do
   alias Expert.Provider.Handlers
   alias Forge.Document
   alias Forge.Document.Location
-  alias Forge.Protocol.Convert
+  alias Expert.Protocol.Convert
   alias GenLSP.Requests.TextDocumentDefinition
   alias GenLSP.Structures
 
@@ -41,7 +41,7 @@ defmodule Expert.Provider.Handlers.GoToDefinitionTest do
 
     with {:ok, _} <- Document.Store.open_temporary(uri) do
       req = %TextDocumentDefinition{
-        id: Forge.Protocol.Id.next(),
+        id: Expert.Protocol.Id.next(),
         params: %Structures.DefinitionParams{
           text_document: %Structures.TextDocumentIdentifier{uri: uri},
           position: %Structures.Position{line: line, character: char}
diff --git a/apps/expert/test/expert/provider/handlers/hover_test.exs b/apps/expert/test/expert/provider/handlers/hover_test.exs
@@ -4,7 +4,7 @@ defmodule Expert.Provider.Handlers.HoverTest do
   alias Forge.Document
   alias Forge.Document.Position
   alias Forge.EngineApi.Messages
-  alias Forge.Protocol.Convert
+  alias Expert.Protocol.Convert
   alias Forge.Test.Fixtures
   alias GenLSP.Requests
   alias GenLSP.Structures
@@ -755,7 +755,7 @@ defmodule Expert.Provider.Handlers.HoverTest do
 
     with {:ok, _} <- Document.Store.open_temporary(uri) do
       req = %Requests.TextDocumentHover{
-        id: Forge.Protocol.Id.next(),
+        id: Expert.Protocol.Id.next(),
         params: %Structures.HoverParams{
           # convert line and char to zero-based
           position: %Structures.Position{line: line - 1, character: char - 1},
diff --git a/apps/expert/test/support/test/convertible_support.ex b/apps/expert/test/support/test/convertible_support.ex
@@ -1,4 +1,4 @@
-defmodule Forge.Test.Protocol.ConvertibleSupport do
+defmodule Expert.Test.Protocol.ConvertibleSupport do
   alias Forge.Document
   alias Forge.Protocol.Convertible
 
diff --git a/apps/forge/mix.exs b/apps/forge/mix.exs
@@ -34,7 +34,6 @@ defmodule Forge.MixProject do
       {:benchee, "~> 1.3", only: :test},
       Mix.Credo.dependency(),
       Mix.Dialyzer.dependency(),
-      {:gen_lsp, "~> 0.11"},
       {:snowflake, "~> 1.0"},
       {:sourceror, "~> 1.9"},
       {:stream_data, "~> 1.1", only: [:test], runtime: false},
