Cleanup

Author: andyw8

lib/ruby_lsp/ruby_lsp_rails/addon.rb

@@ -27,22 +27,18 @@ def initialize
         # We first initialize the client as a NullClient, so that we can start the server in a background thread. Until
         # the real client is initialized, features that depend on it will not be blocked by using the NullClient
         @client = T.let(NullClient.new, RunnerClient)
+        @global_state = T.let(nil, T.nilable(GlobalState))
       end
 
       sig { override.params(global_state: GlobalState, message_queue: Thread::Queue).void }
       def activate(global_state, message_queue)
-        @global_state = T.let(global_state, T.nilable(RubyLsp::GlobalState))
+        @global_state = global_state
         $stderr.puts("Activating Ruby LSP Rails addon v#{VERSION}")
         # Start booting the real client in a background thread. Until this completes, the client will be a NullClient
-        Thread.new do
-          @client = RunnerClient.create_client
-          # TODO: move rails_runner_stdin to be in ruby-lsp instead of ivar_get
-          # (or maybe somet other way, probably not in global state)
-          @global_state.instance_variable_set(:@rails_runner_stdin, @client.stdin)
-        end
+        Thread.new { @client = RunnerClient.create_client(global_state) }
         register_additional_file_watchers(global_state: global_state, message_queue: message_queue)
 
-        T.must(@global_state).index.register_enhancement(IndexingEnhancement.new)
+        @global_state.index.register_enhancement(IndexingEnhancement.new)
       end
 
       sig { override.void }

lib/ruby_lsp/ruby_lsp_rails/runner_client.rb

@@ -10,10 +10,12 @@ class RunnerClient
       class << self
         extend T::Sig
 
-        sig { returns(RunnerClient) }
-        def create_client
+        sig do
+          params(global_state: GlobalState).returns(RunnerClient)
+        end
+        def create_client(global_state)
           if File.exist?("bin/rails")
-            new
+            new(global_state)
           else
             $stderr.puts(<<~MSG)
               Ruby LSP Rails failed to locate bin/rails in the current directory: #{Dir.pwd}"
@@ -39,10 +41,11 @@ class EmptyMessageError < StandardError; end
       sig { returns(String) }
       attr_reader :rails_root
 
+      sig { returns(IO) }
       attr_reader :stdin
 
-      sig { void }
-      def initialize
+      sig { params(global_state: RubyLsp::GlobalState).void }
+      def initialize(global_state)
         # Spring needs a Process session ID. It uses this ID to "attach" itself to the parent process, so that when the
         # parent ends, the spring process ends as well. If this is not set, Spring will throw an error while trying to
         # set its own session ID