Refactor

Author: andyw8

lib/ruby_lsp/ruby_lsp_rails/server.rb

@@ -57,26 +57,42 @@ def start
 
       def execute(request, params)
         if request.include?(".")
-          addon, command = request.split(".")
-
-          unless addon.present? && command.present?
-            return { error: "Invalid request format: #{request}" }
-          end
-
-          # TODO: handle invalid input
-          @addons[addon.to_sym] ||= self.class.require_server_addon(addon)
-          File.open("ruby-lsp-rails.txt", "a") do |f|
-            $stdout = f
-            $stderr = f
-            addon = @addons[addon.to_sym]
-            # TODO: why didn't I see an error when 'dsl' was typoed?
-            addon.send(command, params)
-          rescue => e
-            $stderr.puts "*** rescued Error: #{e.full_message(highlight: false)}"
-          end
-          return VOID
+          execute_for_addon(request, params)
+        else
+          execute_for_ruby_lsp_rails(request, params)
+        end
+      end
+
+      private
+
+      def execute_for_addon(request, params)
+        addon, command = request.split(".")
+
+        unless addon.present? && command.present?
+          return { error: "Invalid request format: #{request}" }
+        end
+
+        begin
+          @addons[addon.to_sym] ||= self.class.require_server_addon(addon).new
+        rescue InvalidAddonError
+          return { error: "222 Loading addon '#{addon}' failed" }
         end
 
+        # TODO: Verify error is seen
+        unless @addons[addon.to_sym]
+          return { error: "Loading addon '#{addon}' failed" }
+        end
+
+        File.open("ruby-lsp-rails.txt", "a") do |f|
+          addon = @addons[addon.to_sym]
+          # TODO: why didn't I see an error when 'dsl' was typoed?
+
+          addon.send(command, params)
+        end
+        VOID
+      end
+
+      def execute_for_ruby_lsp_rails(request, params)
         case request
         when "shutdown"
           @running = false
@@ -99,8 +115,6 @@ def execute(request, params)
         { error: e.full_message(highlight: false) }
       end
 
-      private
-
       def resolve_route_info(requirements)
         if requirements[:controller]
           requirements[:controller] = requirements.fetch(:controller).underscore.delete_suffix("_controller")