Log project uri

Author: badosu

apps/expert/lib/expert.ex

@@ -59,7 +59,7 @@ defmodule Expert do
       Task.Supervisor.start_child(:expert_task_queue, fn ->
         config = state.configuration
 
-        log_info(lsp, "Starting project at uri #{config.project.root_uri}")
+        log_info(lsp, "Starting project")
 
         start_result = Project.Supervisor.start(config.project)
 
@@ -209,13 +209,15 @@ defmodule Expert do
   end
 
   def log_info(lsp \\ get_lsp(), message) do
+    message = log_prepend_project_root(message, assigns(lsp).state)
     Logger.info(message)
 
     GenLSP.info(lsp, message)
   end
 
   # When logging errors we also notify the client to display the message
   def log_error(lsp \\ get_lsp(), message) do
+    message = log_prepend_project_root(message, assigns(lsp).state)
     Logger.error(message)
 
     log_level = Enumerations.MessageType.error()
@@ -331,4 +333,12 @@ defmodule Expert do
         "Failed to start engine #{name}: #{inspect(reason)}"
     end
   end
+
+  defp log_prepend_project_root(message, %State{
+         configuration: %Expert.Configuration{project: %Forge.Project{} = project}
+       }) do
+    "[Project #{project.root_uri}] #{message}"
+  end
+
+  defp log_prepend_project_root(message, _state), do: message
 end

apps/expert/test/expert_test.exs

@@ -1,4 +1,7 @@
 defmodule Expert.ExpertTest do
+  alias Expert.State
+  alias Forge.Test.Fixtures
+
   use ExUnit.Case, async: true
   use Patch
 
@@ -8,15 +11,39 @@ defmodule Expert.ExpertTest do
     with_patched_transport()
 
     assigns = start_supervised!(GenLSP.Assigns, id: make_ref())
-    GenLSP.Assigns.merge(assigns, %{state: %{}})
+    project = Fixtures.project()
+
+    root_uri = project.root_uri
+    root_path = Forge.Project.root_path(project)
+
+    request = %GenLSP.Requests.Initialize{
+      id: 1,
+      jsonrpc: "2.0",
+      method: "initialize",
+      params: %GenLSP.Structures.InitializeParams{
+        capabilities: %GenLSP.Structures.ClientCapabilities{},
+        process_id: "",
+        root_uri: root_uri,
+        root_path: root_path,
+        workspace_folders: [
+          %GenLSP.Structures.WorkspaceFolder{
+            name: root_path,
+            uri: root_uri
+          }
+        ]
+      }
+    }
+
+    {:ok, _response, state} = State.initialize(State.new(), request)
+    GenLSP.Assigns.merge(assigns, %{state: state})
 
     lsp = %GenLSP.LSP{mod: Expert, assigns: assigns}
 
     reason = :something_bad
 
     assert {:noreply, ^lsp} = Expert.handle_info({:engine_initialized, {:error, reason}}, lsp)
 
-    error_message = "Failed to initialize: #{inspect(reason)}"
+    error_message = "[Project #{project.root_uri}] Failed to initialize: #{inspect(reason)}"
     error_message_type = GenLSP.Enumerations.MessageType.error()
 
     assert_receive {:transport,