Merge main

doorgan · doorgan · commit 63ceee101801 · 2025-06-23T15:52:53.000-03:00
diff --git a/apps/engine/lib/engine/engine.ex b/apps/engine/lib/engine/engine.ex
@@ -119,12 +119,12 @@ defmodule Engine do
   end
 
   def manager_node_name(%Project{} = project) do
-    workspace = Lexical.Workspace.get_workspace()
+    workspace = Forge.Workspace.get_workspace()
 
     workspace_name =
       case workspace do
         nil -> Project.name(project)
-        _ -> Lexical.Workspace.name(workspace)
+        _ -> Forge.Workspace.name(workspace)
       end
 
     :"manager-#{workspace_name}-#{Project.entropy(project)}@127.0.0.1"
diff --git a/apps/expert/lib/expert.ex b/apps/expert/lib/expert.ex
@@ -127,8 +127,6 @@ defmodule Expert do
   def handle_message(%_{} = request, %State{} = state) do
     with {:ok, handler} <- fetch_handler(request),
          {:ok, request} <- Convert.to_native(request) do
-      # Logger.info("Handling request: #{inspect(request, pretty: true)}")
-
       TaskQueue.add(request.id, {handler, :handle, [request, state.configuration]})
     else
       {:error, {:unhandled, _}} ->
diff --git a/apps/expert/lib/expert/configuration.ex b/apps/expert/lib/expert/configuration.ex
@@ -44,7 +44,7 @@ defmodule Expert.Configuration do
   end
 
   defp find_projects(root_uri) do
-    root_path = Lexical.Document.Path.from_uri(root_uri)
+    root_path = Forge.Document.Path.from_uri(root_uri)
     root_mix_exs = Path.join(root_path, "mix.exs")
 
     projects =
@@ -65,7 +65,7 @@ defmodule Expert.Configuration do
       project_uri =
         mix_exs_path
         |> Path.dirname()
-        |> Lexical.Document.Path.to_uri()
+        |> Forge.Document.Path.to_uri()
 
       Project.new(project_uri)
     end
diff --git a/apps/expert/lib/expert/provider/handlers/code_action.ex b/apps/expert/lib/expert/provider/handlers/code_action.ex
@@ -1,6 +1,7 @@
 defmodule Expert.Provider.Handlers.CodeAction do
   alias Engine.CodeAction
   alias Expert.Configuration
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Requests
   alias GenLSP.Structures
@@ -11,11 +12,12 @@ defmodule Expert.Provider.Handlers.CodeAction do
         %Configuration{} = config
       ) do
     document = Forge.Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
     diagnostics = Enum.map(params.context.diagnostics, &to_code_action_diagnostic/1)
 
     code_actions =
       Engine.Api.code_actions(
-        config.project,
+        project,
         document,
         params.range,
         diagnostics,
diff --git a/apps/expert/lib/expert/provider/handlers/code_lens.ex b/apps/expert/lib/expert/provider/handlers/code_lens.ex
@@ -16,12 +16,13 @@ defmodule Expert.Provider.Handlers.CodeLens do
         %Requests.TextDocumentCodeLens{params: %Structures.CodeLensParams{} = params} = request,
         %Configuration{} = config
       ) do
-    project = Project.project_for_document(config.projects, request.document)
+    document = Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
 
     document = Document.Container.context_document(params, nil)
 
     lenses =
-      case reindex_lens(project, request.document) do
+      case reindex_lens(project, document) do
         nil -> []
         lens -> List.wrap(lens)
       end
diff --git a/apps/expert/lib/expert/provider/handlers/completion.ex b/apps/expert/lib/expert/provider/handlers/completion.ex
@@ -4,6 +4,7 @@ defmodule Expert.Provider.Handlers.Completion do
   alias Forge.Ast
   alias Forge.Document
   alias Forge.Document.Position
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Enumerations.CompletionTriggerKind
   alias GenLSP.Requests
@@ -19,10 +20,11 @@ defmodule Expert.Provider.Handlers.Completion do
         %Configuration{} = config
       ) do
     document = Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
 
     completions =
       CodeIntelligence.Completion.complete(
-        config.project,
+        project,
         document_analysis(document, params.position),
         params.position,
         params.context || %CompletionContext{trigger_kind: CompletionTriggerKind.invoked()}
diff --git a/apps/expert/lib/expert/provider/handlers/document_symbols.ex b/apps/expert/lib/expert/provider/handlers/document_symbols.ex
@@ -3,16 +3,18 @@ defmodule Expert.Provider.Handlers.DocumentSymbols do
   alias Engine.CodeIntelligence.Symbols
   alias Expert.Configuration
   alias Forge.Document
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Enumerations.SymbolKind
   alias GenLSP.Requests
   alias GenLSP.Structures
 
   def handle(%Requests.TextDocumentDocumentSymbol{} = request, %Configuration{} = config) do
     document = Document.Container.context_document(request.params, nil)
+    project = Project.project_for_document(config.projects, document)
 
     symbols =
-      config.project
+      project
       |> Api.document_symbols(document)
       |> Enum.map(&to_response(&1, document))
 
diff --git a/apps/expert/lib/expert/provider/handlers/find_references.ex b/apps/expert/lib/expert/provider/handlers/find_references.ex
@@ -3,6 +3,7 @@ defmodule Expert.Provider.Handlers.FindReferences do
   alias Expert.Configuration
   alias Forge.Ast
   alias Forge.Document
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Requests.TextDocumentReferences
   alias GenLSP.Structures
@@ -14,12 +15,13 @@ defmodule Expert.Provider.Handlers.FindReferences do
         %Configuration{} = config
       ) do
     document = Forge.Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
     include_declaration? = !!params.context.include_declaration
 
     locations =
       case Document.Store.fetch(document.uri, :analysis) do
         {:ok, _document, %Ast.Analysis{} = analysis} ->
-          Api.references(config.project, analysis, params.position, include_declaration?)
+          Api.references(project, analysis, params.position, include_declaration?)
 
         _ ->
           nil
diff --git a/apps/expert/lib/expert/provider/handlers/formatting.ex b/apps/expert/lib/expert/provider/handlers/formatting.ex
@@ -1,6 +1,7 @@
 defmodule Expert.Provider.Handlers.Formatting do
   alias Expert.Configuration
   alias Forge.Document.Changes
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Requests
   alias GenLSP.Structures
@@ -13,8 +14,9 @@ defmodule Expert.Provider.Handlers.Formatting do
         %Configuration{} = config
       ) do
     document = Forge.Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
 
-    case Engine.Api.format(config.project, document) do
+    case Engine.Api.format(project, document) do
       {:ok, %Changes{} = document_edits} ->
         response = %Response{id: request.id, result: document_edits}
         {:reply, response}
diff --git a/apps/expert/lib/expert/provider/handlers/go_to_definition.ex b/apps/expert/lib/expert/provider/handlers/go_to_definition.ex
@@ -1,5 +1,6 @@
 defmodule Expert.Provider.Handlers.GoToDefinition do
   alias Expert.Configuration
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Requests
   alias GenLSP.Structures
@@ -13,8 +14,9 @@ defmodule Expert.Provider.Handlers.GoToDefinition do
         %Configuration{} = config
       ) do
     document = Forge.Document.Container.context_document(params, nil)
+    project = Project.project_for_document(config.projects, document)
 
-    case Engine.Api.definition(config.project, document, params.position) do
+    case Engine.Api.definition(project, document, params.position) do
       {:ok, native_location} ->
         {:reply, %Response{id: request.id, result: native_location}}
 
diff --git a/apps/expert/lib/expert/provider/handlers/hover.ex b/apps/expert/lib/expert/provider/handlers/hover.ex
@@ -20,8 +20,7 @@ defmodule Expert.Provider.Handlers.Hover do
         %Configuration{} = config
       ) do
     document = Document.Container.context_document(params, nil)
-
-    project = Project.project_for_document(config.projects, request.document)
+    project = Project.project_for_document(config.projects, document)
 
     maybe_hover =
       with {:ok, _document, %Ast.Analysis{} = analysis} <-
diff --git a/apps/expert/lib/expert/provider/handlers/workspace_symbol.ex b/apps/expert/lib/expert/provider/handlers/workspace_symbol.ex
@@ -2,6 +2,7 @@ defmodule Expert.Provider.Handlers.WorkspaceSymbol do
   alias Engine.Api
   alias Engine.CodeIntelligence.Symbols
   alias Expert.Configuration
+  alias Forge.Project
   alias Forge.Protocol.Response
   alias GenLSP.Enumerations.SymbolKind
   alias GenLSP.Requests
@@ -15,10 +16,7 @@ defmodule Expert.Provider.Handlers.WorkspaceSymbol do
       ) do
     symbols =
       if String.length(params.query) > 1 do
-        config.project
-        |> Api.workspace_symbols(params.query)
-        |> tap(fn symbols -> Logger.info("syms #{inspect(Enum.take(symbols, 5))}") end)
-        |> Enum.map(&to_response/1)
+        Enum.flat_map(config.projects, &gather_symbols(&1, request))
       else
         []
       end
@@ -30,6 +28,18 @@ defmodule Expert.Provider.Handlers.WorkspaceSymbol do
     {:reply, response}
   end
 
+  defp gather_symbols(
+         %Project{} = project,
+         %Requests.WorkspaceSymbol{
+           params: %Structures.WorkspaceSymbolParams{} = params
+         }
+       ) do
+    project
+    |> Api.workspace_symbols(params.query)
+    |> tap(fn symbols -> Logger.info("syms #{inspect(Enum.take(symbols, 5))}") end)
+    |> Enum.map(&to_response/1)
+  end
+
   def to_response(%Symbols.Workspace{} = root) do
     %Structures.WorkspaceSymbol{
       kind: to_kind(root.type),
diff --git a/apps/expert/lib/expert/state.ex b/apps/expert/lib/expert/state.ex
@@ -6,6 +6,7 @@ defmodule Expert.State do
   alias Expert.Provider.Handlers
   alias Expert.Transport
   alias Forge.Document
+  alias Forge.Project
   alias Forge.Protocol.Id
   alias Forge.Protocol.Response
   alias GenLSP.Enumerations
@@ -47,11 +48,11 @@ defmodule Expert.State do
         _ -> nil
       end
 
-    root_path = Lexical.Document.Path.from_uri(event.root_uri)
+    root_path = Forge.Document.Path.from_uri(event.root_uri)
 
     root_path
-    |> Lexical.Workspace.new()
-    |> Lexical.Workspace.set_workspace()
+    |> Forge.Workspace.new()
+    |> Forge.Workspace.set_workspace()
 
     config = Configuration.new(event.root_uri, event.capabilities, client_name)
     new_state = %__MODULE__{state | configuration: config, initialized?: true}
@@ -67,7 +68,7 @@ defmodule Expert.State do
 
     for project <- config.projects do
       Logger.info("Starting project at uri #{project.root_uri}")
-      result = Project.Supervisor.start(project)
+      result = Expert.Project.Supervisor.start(project)
       Logger.info("result: #{inspect(result)}")
     end
 
@@ -147,11 +148,11 @@ defmodule Expert.State do
   def apply(%__MODULE__{} = state, %Notifications.TextDocumentDidChange{params: event}) do
     uri = event.text_document.uri
     version = event.text_document.version
-    project = Forge.Project.project_for_uri(state.configuration.projects, uri)
+    project = Project.project_for_uri(state.configuration.projects, uri)
 
     case Document.Store.get_and_update(
            uri,
-           &Document.apply_content_changes(&1, version, event.lsp.content_changes)
+           &Document.apply_content_changes(&1, version, event.content_changes)
          ) do
       {:ok, updated_source} ->
         updated_message =
@@ -208,7 +209,7 @@ defmodule Expert.State do
 
   def apply(%__MODULE__{} = state, %Notifications.TextDocumentDidSave{params: event}) do
     uri = event.text_document.uri
-    project = Lexical.Project.project_for_uri(state.configuration.projects, uri)
+    project = Forge.Project.project_for_uri(state.configuration.projects, uri)
 
     case Document.Store.save(uri) do
       :ok ->
@@ -238,7 +239,7 @@ defmodule Expert.State do
         change <- event.changes do
       event = filesystem_event(project: Project, uri: change.uri, event_type: change.type)
       Engine.Api.broadcast(project, event)
-    end)
+    end
 
     {:ok, state}
   end
diff --git a/apps/forge/lib/forge/document/container.ex b/apps/forge/lib/forge/document/container.ex
@@ -36,13 +36,24 @@ defimpl Forge.Document.Container, for: Any do
     context_document(lsp_request, parent_context_document)
   end
 
+  def context_document(%{params: params}, parent_context_document) do
+    context_document(params, parent_context_document)
+  end
+
   def context_document(%{text_document: %{uri: uri}}, parent_context_document) do
     case Document.Store.fetch(uri) do
       {:ok, document} -> document
       _ -> parent_context_document
     end
   end
 
+  def context_document(%{uri: uri}, parent_context_document) when is_binary(uri) do
+    case Document.Store.fetch(uri) do
+      {:ok, document} -> document
+      _ -> parent_context_document
+    end
+  end
+
   def context_document(_, parent_context_document) do
     parent_context_document
   end
diff --git a/apps/forge/lib/forge/project.ex b/apps/forge/lib/forge/project.ex
@@ -329,7 +329,7 @@ defmodule Forge.Project do
     path = Document.Path.from_uri(uri)
 
     Enum.find(projects, fn project ->
-      Lexical.Path.parent_path?(path, root_path(project))
+      Forge.Path.parent_path?(path, root_path(project))
     end)
   end
 
@@ -338,7 +338,7 @@ defmodule Forge.Project do
   """
   def project_for_document(projects, %Document{} = document) do
     Enum.find(projects, fn project ->
-      Lexical.Path.parent_path?(document.path, root_path(project))
+      Forge.Path.parent_path?(document.path, root_path(project))
     end)
   end
 end
