From 0c98405c76cdf7ffbe685dce16775aadaa46ef2b Mon Sep 17 00:00:00 2001
From: Andy Waite <andy.waite@shopify.com>
Date: Wed, 16 Oct 2024 12:52:01 -0400
Subject: [PATCH] Fix exception output capturing (#482)

---
 lib/ruby_lsp/ruby_lsp_rails/server.rb     | 17 +++++++++++------
 test/ruby_lsp_rails/runner_client_test.rb |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/ruby_lsp/ruby_lsp_rails/server.rb b/lib/ruby_lsp/ruby_lsp_rails/server.rb
index 42278d6f..f8a5308f 100644
--- a/lib/ruby_lsp/ruby_lsp_rails/server.rb
+++ b/lib/ruby_lsp/ruby_lsp_rails/server.rb
@@ -15,8 +15,8 @@ def send_message(message)
         @stdout.write("Content-Length: #{json_message.length}\r\n\r\n#{json_message}")
       end
 
-      # Log a debug message to the editor's output
-      def debug_message(message)
+      # Log a message to the editor's output panel
+      def log_message(message)
         $stderr.puts(message)
       end
     end
@@ -119,12 +119,17 @@ def execute(request, params)
           require params[:server_addon_path]
           ServerAddon.finalize_registrations!(@stdout)
         when "server_addon/delegate"
-          server_addon_name = params.delete(:server_addon_name)
-          request_name = params.delete(:request_name)
-          ServerAddon.delegate(server_addon_name, request_name, params)
+          server_addon_name = params[:server_addon_name]
+          request_name = params[:request_name]
+          ServerAddon.delegate(server_addon_name, request_name, params.except(:request_name, :server_addon_name))
         end
+        request_name = request
+        request_name = "#{params[:server_addon_name]}##{params[:request_name]}" if request == "server_addon/delegate"
+      # Since this is a common problem, we show a specific error message to the user, instead of the full stack trace.
+      rescue ActiveRecord::ConnectionNotEstablished
+        log_message("Request #{request_name} failed because database connection was not established.")
       rescue => e
-        send_message({ error: e.full_message(highlight: false) })
+        log_message("Request #{request_name} failed:\n" + e.full_message(highlight: false))
       end
 
       private
diff --git a/test/ruby_lsp_rails/runner_client_test.rb b/test/ruby_lsp_rails/runner_client_test.rb
index 38728b42..2bec27c4 100644
--- a/test/ruby_lsp_rails/runner_client_test.rb
+++ b/test/ruby_lsp_rails/runner_client_test.rb
@@ -127,7 +127,7 @@ def name
             end
 
             def execute(request, params)
-              debug_message("Hello!")
+              log_message("Hello!")
               send_message({ request:, params: })
             end
           end